Merge pull request NordicSemiconductor#431 from NordicSemiconductor/bugfix/foreground-service

Foreground service behavior fixed

Author: philips77

lib/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java

@@ -831,7 +831,11 @@ void restartService(@NonNull final Intent intent, final boolean scanForBootloade
 		// Reset the DFU attempt counter
 		intent.putExtra(DfuBaseService.EXTRA_DFU_ATTEMPT, 0);
 
-		mService.startService(intent);
+		final boolean foregroundService = intent.getBooleanExtra(DfuBaseService.EXTRA_FOREGROUND_SERVICE, true);
+		if (foregroundService && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+			mService.startForegroundService(intent);
+		else
+			mService.startService(intent);
 	}
 
 	protected String parse(@Nullable final byte[] data) {

lib/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java

@@ -1356,7 +1356,11 @@ protected void onHandleIntent(@Nullable final Intent intent) {
 					final Intent newIntent = new Intent();
 					newIntent.fillIn(intent, Intent.FILL_IN_COMPONENT | Intent.FILL_IN_PACKAGE);
 					newIntent.putExtra(EXTRA_RECONNECTION_ATTEMPT, attempt + 1);
-					startService(newIntent);
+
+					if (foregroundService && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+						startForegroundService(newIntent);
+					else
+						startService(newIntent);
 					return;
 				}
 				terminateConnection(gatt, mError);
@@ -1415,7 +1419,11 @@ protected void onHandleIntent(@Nullable final Intent intent) {
 					final Intent newIntent = new Intent();
 					newIntent.fillIn(intent, Intent.FILL_IN_COMPONENT | Intent.FILL_IN_PACKAGE);
 					newIntent.putExtra(EXTRA_DFU_ATTEMPT, attempt + 1);
-					startService(newIntent);
+
+					if (foregroundService && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+						startForegroundService(newIntent);
+					else
+						startService(newIntent);
 					return;
 				}
 				report(ERROR_DEVICE_DISCONNECTED);
@@ -1914,7 +1922,12 @@ private void startForeground() {
 		// Any additional configuration?
 		updateForegroundNotification(builder);
 
-		startForeground(NOTIFICATION_ID, builder.build());
+		try {
+			startForeground(NOTIFICATION_ID, builder.build());
+		} catch (final SecurityException e) {
+			loge("Service cannot be started in foreground", e);
+			logi("Starting DFU service in background instead");
+		}
 	}
 
 	/**