Automated import from //branches/cupcake/...@142047,142047

diff --git a/src/com/android/alarmclock/AlarmAlert.java b/src/com/android/alarmclock/AlarmAlert.java
index 6a9a718..a89a884 100644 (file)
--- a/src/com/android/alarmclock/AlarmAlert.java
+++ b/src/com/android/alarmclock/AlarmAlert.java
@@ -264,6 +264,9 @@ public class AlarmAlert extends Activity {
         if (Log.LOGV) Log.v("AlarmAlert.onStop()");
         // As a last resort, try to snooze if this activity is stopped.
         snooze();
+        // We might have been killed by the KillerCallback so always release
+        // the lock and keyguard.
+        releaseLocks();
     }
 
     @Override