Make RS go to foreground if confirmed device

Author: joeygrover

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

@@ -230,7 +230,7 @@ public void onListObtained(boolean successful) {
      * @param altTransportWake if the alt transport flag should be set. Only used in debug
      * @param device the connected bluetooth device
      */
-	private static void startRouterService(Context context, ComponentName componentName, boolean altTransportWake, BluetoothDevice device) {
+	private static void startRouterService(Context context, ComponentName componentName, boolean altTransportWake, BluetoothDevice device, boolean confirmedDevice) {
 		if (componentName == null) {
 			return;
 		}
@@ -246,6 +246,10 @@ private static void startRouterService(Context context, ComponentName componentN
 			serviceIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
 		}
 
+		if (confirmedDevice) {
+		    serviceIntent.putExtra(TransportConstants.CONFIRMED_SDL_DEVICE, confirmedDevice);
+        }
+
 		try {
 			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
 				context.startService(serviceIntent);
@@ -301,7 +305,7 @@ public void onComplete(Vector<ComponentName> routerServices) {
 						}
 
 						if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
-							startRouterService(context, sdlAppInfoList.get(0).getRouterServiceComponentName(), altTransportWake, device);
+							startRouterService(context, sdlAppInfoList.get(0).getRouterServiceComponentName(), altTransportWake, device, false);
 						} else{
 							Log.d(TAG, "No SDL Router Services found");
 							Log.d(TAG, "WARNING: This application has not specified its SdlRouterService correctly in the manifest. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");
@@ -562,7 +566,7 @@ public boolean onTransportConnected(Context context, BluetoothDevice bluetoothDe
 								final List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(context, new SdlAppInfo.BestRouterComparator());
 								if(sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
 									ComponentName routerService = sdlAppInfoList.get(0).getRouterServiceComponentName();
-									startRouterService(context, routerService, false, bluetoothDevice);
+									startRouterService(context, routerService, false, bluetoothDevice, true);
 								}
 							}
 						}

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

@@ -1259,7 +1259,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 							address = device.getAddress();
 						}
 					}
-					int timeout = getNotificationTimeout(address);
+					boolean confirmedDevice = intent.getBooleanExtra(TransportConstants.CONFIRMED_SDL_DEVICE, false);
+					int timeout = getNotificationTimeout(address, confirmedDevice);
+
 					enterForeground("Waiting for connection...", timeout, false);
 					resetForegroundTimeOut(timeout);
 				} else {
@@ -1383,9 +1385,9 @@ private void notifyAltTransportOfClose(int reason){
 	 * @return the amount of time for a timeout handler to remove the notification.
 	 */
 	@SuppressLint("MissingPermission")
-	private int getNotificationTimeout(String address){
+	private int getNotificationTimeout(String address, boolean confirmedDevice){
 		if(address != null){
-			if(hasSDLConnected(address)){
+			if(confirmedDevice || hasSDLConnected(address)){
 				return FOREGROUND_TIMEOUT * 2;
 			}else if(this.isFirstStatusCheck(address)) {
 				// If this is the first time the service has ever connected to this device we want

base/src/main/java/com/smartdevicelink/transport/TransportConstants.java

@@ -43,6 +43,7 @@ public class TransportConstants {
 	public static final String START_ROUTER_SERVICE_ACTION					="sdl.router.startservice";
 	public static final String ROUTER_SERVICE_ACTION						= "com.smartdevicelink.router.service";
 	public static final String FOREGROUND_EXTRA 							= "foreground";
+	public static final String CONFIRMED_SDL_DEVICE 						= "confirmed_sdl_device";
 
 	public static final String BIND_LOCATION_PACKAGE_NAME_EXTRA 			= "BIND_LOCATION_PACKAGE_NAME_EXTRA";
 	public static final String BIND_LOCATION_CLASS_NAME_EXTRA				= "BIND_LOCATION_CLASS_NAME_EXTRA";