From 9bd97eea31151a35e87fd8f6c1fee189238241b9 Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Thu, 26 Jun 2014 09:48:48 -0700 Subject: [PATCH] Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937. r=mcomella --- .../announcements/AnnouncementsBroadcastService.java | 3 ++- .../base/background/announcements/AnnouncementsService.java | 3 ++- .../background/healthreport/HealthReportBroadcastService.java | 3 ++- .../healthreport/prune/HealthReportPruneService.java | 3 ++- .../healthreport/upload/HealthReportUploadService.java | 3 ++- mobile/android/base/fxa/receivers/FxAccountDeletedService.java | 3 ++- .../android/base/sync/receivers/SyncAccountDeletedService.java | 1 + 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mobile/android/base/background/announcements/AnnouncementsBroadcastService.java b/mobile/android/base/background/announcements/AnnouncementsBroadcastService.java index 22c3d4e48d36..0fec7fc20461 100644 --- a/mobile/android/base/background/announcements/AnnouncementsBroadcastService.java +++ b/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(); diff --git a/mobile/android/base/background/announcements/AnnouncementsService.java b/mobile/android/base/background/announcements/AnnouncementsService.java index fdddd8f0faf5..cea3418ebdd9 100644 --- a/mobile/android/base/background/announcements/AnnouncementsService.java +++ b/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."); diff --git a/mobile/android/base/background/healthreport/HealthReportBroadcastService.java b/mobile/android/base/background/healthreport/HealthReportBroadcastService.java index aaf0d669c426..5553c70cc2de 100644 --- a/mobile/android/base/background/healthreport/HealthReportBroadcastService.java +++ b/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. diff --git a/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java b/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java index 6817b8b8a3fc..2427cc42c02f 100644 --- a/mobile/android/base/background/healthreport/prune/HealthReportPruneService.java +++ b/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."); diff --git a/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java b/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java index 5dc6ab7cab5c..d83d848a193a 100644 --- a/mobile/android/base/background/healthreport/upload/HealthReportUploadService.java +++ b/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) { diff --git a/mobile/android/base/fxa/receivers/FxAccountDeletedService.java b/mobile/android/base/fxa/receivers/FxAccountDeletedService.java index 790bad2d1053..e40aa5daae7d 100644 --- a/mobile/android/base/fxa/receivers/FxAccountDeletedService.java +++ b/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; diff --git a/mobile/android/base/sync/receivers/SyncAccountDeletedService.java b/mobile/android/base/sync/receivers/SyncAccountDeletedService.java index c3d6f1e9d934..02db415e15a8 100644 --- a/mobile/android/base/sync/receivers/SyncAccountDeletedService.java +++ b/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;