Merge "Ignore Wakelock Under-Locked Exception" into klp-dev
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 @@
}
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() {