Feature/0293 oem android specific

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java

@@ -59,6 +59,7 @@
 import com.smartdevicelink.util.SdlAppInfo;
 import com.smartdevicelink.util.ServiceFinder;
 
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
@@ -147,7 +148,7 @@ public void onReceive(Context context, Intent intent) {
             DebugTool.logError(TAG, "You cannot use the default SdlRouterService class, it must be extended in your project. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");
         }
 
-        Hashtable<String, Object> vehicleInfoStore = (Hashtable<String, Object>) intent.getSerializableExtra(TransportConstants.CONNECT_VEHICLE_INFO);
+        HashMap<String, Object> vehicleInfoStore = (HashMap<String, Object>) intent.getSerializableExtra(TransportConstants.CONNECT_VEHICLE_INFO);
 
         VehicleType vehicleType;
         if (vehicleInfoStore == null || vehicleInfoStore.isEmpty()){

android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java

@@ -110,7 +110,12 @@ public void start() {
         if (hasSDLConnected(contextWeakReference.get(), connectedDevice.getAddress())) {
             DebugTool.logInfo(TAG, ": Confirmed SDL device, should start router service");
             //This device has connected to SDL previously, it is ok to start the RS right now
-            callback.onTransportConnected(contextWeakReference.get(), connectedDevice, new VehicleType(getVehicleTypeFromPrefs(contextWeakReference.get(), connectedDevice.getAddress())));
+            VehicleType vehicleType = null;
+            Hashtable<String, Object> store = getVehicleTypeFromPrefs(contextWeakReference.get(), connectedDevice.getAddress());
+            if(store != null){
+                vehicleType = new VehicleType(store);
+            }
+            callback.onTransportConnected(contextWeakReference.get(), connectedDevice,vehicleType);
             return;
         }
         synchronized (RUNNING_LOCK) {
@@ -250,7 +255,7 @@ public void notifyConnection(@Nullable VehicleType vehicleType) {
         }
     }
 
-    private static void saveVehicleType(Context context, VehicleType vehicleType, String address) {
+    public static void saveVehicleType(Context context, VehicleType vehicleType, String address) {
         synchronized (LOCK) {
 
             if (vehicleType == null || address == null) {

android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java

@@ -59,6 +59,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import static com.smartdevicelink.util.SdlAppInfo.checkIfVehicleSupported;
+
 public class AndroidTools {
     /**
      * Check to see if a component is exported
@@ -120,7 +122,7 @@ public static List<SdlAppInfo> querySdlAppInfo(Context context, Comparator<SdlAp
                     try {
                         packageInfo = packageManager.getPackageInfo(info.serviceInfo.packageName, 0);
                         SdlAppInfo appInformation = new SdlAppInfo(info, packageInfo, context);
-                        if (type == null || appInformation.vehicleMakesList.isEmpty() || appInformation.vehicleMakesList.contains(type)) {
+                        if (type == null || appInformation.vehicleMakesList.isEmpty() || checkIfVehicleSupported(appInformation.vehicleMakesList,type)) {
                             sdlAppInfoList.add(appInformation);
                         }
                     } catch (NameNotFoundException e) {

android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java

@@ -181,6 +181,46 @@ public static List<VehicleType> deserializeVehicleMake(XmlResourceParser parser)
         }
         return vehicleMakesList;
     }
+
+    static boolean checkIfVehicleSupported(List<VehicleType> supportedVehicleList, VehicleType connectedVehicle){
+        if (null == supportedVehicleList || null == connectedVehicle){
+            return false;
+        }
+        if (supportedVehicleList.contains(connectedVehicle)){
+            return true;
+        }
+        for (VehicleType supportedVehicle :supportedVehicleList) {
+            String svMake = supportedVehicle.getMake();
+            String cvMake = connectedVehicle.getMake();
+            if(svMake != null && cvMake != null && cvMake.equalsIgnoreCase(svMake)) {
+                String svModel = supportedVehicle.getModel();
+                String cvModel = connectedVehicle.getModel();
+                if (svModel != null && cvModel != null) {
+                    if(cvModel.equalsIgnoreCase(svModel)) {
+                        boolean ret = true;
+                        String svMY = supportedVehicle.getModelYear();
+                        String cvMY = connectedVehicle.getModelYear();
+                        if (svMY != null && cvMY != null) {
+                            ret = cvMY.equalsIgnoreCase(svMY);
+                        }
+                        String svTrim = supportedVehicle.getTrim();
+                        String cvTrim = connectedVehicle.getTrim();
+                        if (svTrim != null && cvTrim != null) {
+                            ret &= cvTrim.equalsIgnoreCase(svTrim);
+                        }
+                        if (ret) {
+                            return true;
+                        }
+                    }
+                }
+                else{
+                    /* Return true if only make is defined and it matches*/
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     /**
      * This comparator will sort a list to find the best router service to start out of the known SDL enabled apps
      */