Avoid a NPE in the monkey by checking for a null alarm.

diff --git a/src/com/android/alarmclock/SetAlarm.java b/src/com/android/alarmclock/SetAlarm.java
index 312cf92..7e041f6 100644 (file)
--- a/src/com/android/alarmclock/SetAlarm.java
+++ b/src/com/android/alarmclock/SetAlarm.java
@@ -93,6 +93,11 @@ public class SetAlarm extends PreferenceActivity
 
         /* load alarm details from database */
         Alarm alarm = Alarms.getAlarm(getContentResolver(), mId);
+        // Bad alarm, bail to avoid a NPE.
+        if (alarm == null) {
+            finish();
+            return;
+        }
         mEnabled = alarm.enabled;
         mLabel.setText(alarm.label);
         mLabel.setSummary(alarm.label);