Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937. r=mcomella

mobile/android/base/background/announcements/AnnouncementsBroadcastService.java

@@ -122,7 +122,8 @@ public class AnnouncementsBroadcastService extends BackgroundService {
 
     // Intent can be null. Bug 1025937.
     if (intent == null) {
-        Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     final String action = intent.getAction();

mobile/android/base/background/announcements/AnnouncementsService.java

@@ -120,7 +120,8 @@ public class AnnouncementsService extends BackgroundService implements Announcem
 
     // Intent can be null. Bug 1025937.
     if (intent == null) {
-        Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     Logger.debug(LOG_TAG, "Running AnnouncementsService.");

mobile/android/base/background/healthreport/HealthReportBroadcastService.java

@@ -102,7 +102,8 @@ public class HealthReportBroadcastService extends BackgroundService {
 
     // Intent can be null. Bug 1025937.
     if (intent == null) {
-        Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     // The same intent can be handled by multiple methods so do not short-circuit evaluate.

mobile/android/base/background/healthreport/prune/HealthReportPruneService.java

@@ -42,7 +42,8 @@ public class HealthReportPruneService extends BackgroundService {
 
     // Intent can be null. Bug 1025937.
     if (intent == null) {
-        Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     Logger.debug(LOG_TAG, "Handling prune intent.");

mobile/android/base/background/healthreport/upload/HealthReportUploadService.java

@@ -45,7 +45,8 @@ public class HealthReportUploadService extends BackgroundService {
 
     // Intent can be null. Bug 1025937.
     if (intent == null) {
-        Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     if (HealthReportConstants.UPLOAD_FEATURE_DISABLED) {

mobile/android/base/fxa/receivers/FxAccountDeletedService.java

@@ -31,7 +31,8 @@ public class FxAccountDeletedService extends IntentService {
   protected void onHandleIntent(final Intent intent) {
     // Intent can, in theory, be null. Bug 1025937.
     if (intent == null) {
-        Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     final Context context = this;

mobile/android/base/sync/receivers/SyncAccountDeletedService.java

@@ -35,6 +35,7 @@ public class SyncAccountDeletedService extends IntentService {
     // Intent can, in theory, be null. Bug 1025937.
     if (intent == null) {
       Logger.debug(LOG_TAG, "Short-circuiting on null intent.");
+      return;
     }
 
     final Context context = this;