Merge "Ignore Wakelock Under-Locked Exception" into klp-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-dev

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/android/providers/calendar/CalendarAlarmManager.java b/src/com/android/providers/calendar/CalendarAlarmManager.java
index 596848e..266237d 100644
--- a/src/com/android/providers/calendar/CalendarAlarmManager.java
+++ b/src/com/android/providers/calendar/CalendarAlarmManager.java
@@ -184,7 +184,14 @@ public class CalendarAlarmManager {
     }
 
     void releaseScheduleNextAlarmWakeLock() {
-        getScheduleNextAlarmWakeLock().release();
+        try {
+            getScheduleNextAlarmWakeLock().release();
+        } catch (RuntimeException e) {
+            if (!e.getMessage().startsWith("WakeLock under-locked ")) {
+              throw e;
+            }
+            Log.w(TAG, "WakeLock under-locked ignored.");
+        }
     }
 
     void rescheduleMissedAlarms() {