Bug 1130052 - Try avoid NPE, return from onHandleIntent if null intent. r=vng, a=sledru
--- a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/uploadthread/UploadAlarmReceiver.java
+++ b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/uploadthread/UploadAlarmReceiver.java
@@ -43,18 +43,20 @@ public class UploadAlarmReceiver extends
}
public UploadAlarmService() {
super(LOG_TAG);
}
@Override
protected void onHandleIntent(Intent intent) {
- // Default to a repeating alarm, which is what Fennec Stumbler uses
- boolean isRepeating = (intent == null)? true : intent.getBooleanExtra(EXTRA_IS_REPEATING, true);
+ if (intent == null) {
+ return;
+ }
+ boolean isRepeating = intent.getBooleanExtra(EXTRA_IS_REPEATING, true);
if (DataStorageManager.getInstance() == null) {
DataStorageManager.createGlobalInstance(this, null);
}
upload(isRepeating);
}
void upload(boolean isRepeating) {
if (!isRepeating) {