commit d46932bf3e0cc194ca8e6194a9f4e619b6bd009f
author Alon Albert <aalbert@google.com> Mon Nov 18 17:25:39 2013 -0800
committer Alon Albert <aalbert@google.com> Mon Nov 18 17:25:39 2013 -0800
tree 3a5f22ba919590b7de673a51e5e315475e29e399
parent 579cae45d34ee6096bd22385d45c94876da01145

Ignore Wakelock Under-Locked Exception

Bug: 11751204
Change-Id: I78d9e16ea83a06e1fe3e69b0d8a596d16da271f7

src/com/android/providers/calendar/CalendarAlarmManager.java

diff --git a/src/com/android/providers/calendar/CalendarAlarmManager.java b/src/com/android/providers/calendar/CalendarAlarmManager.java
index dd4ffb8..6cd844d 100644
--- a/src/com/android/providers/calendar/CalendarAlarmManager.java
+++ b/src/com/android/providers/calendar/CalendarAlarmManager.java
@@ -185,7 +185,14 @@
     }
 
     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() {