commit a91ef1ec04affdf98eb89f11b67fdbae72acb8dd
author Christopher Tate <ctate@google.com> Fri Dec 12 13:14:30 2014 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 12 13:14:30 2014 +0000
tree 03ee7a6c997fb65082e61ab42ef375868b177647
parent d0d76540ae937d6773793ba053e81ee3667d0ba6
parent 8965a8da5513cf31a313ecdac3506718c2813932

Properly recognize repeating wakeup alarms
automerge: 8965a8d

* commit '8965a8da5513cf31a313ecdac3506718c2813932':
  Properly recognize repeating wakeup alarms

services/core/java/com/android/server/AlarmManagerService.java

diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 8b524dd..9d6ccfb 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -1425,12 +1425,9 @@
                             maxTriggerTime(nowELAPSED, nextElapsed, alarm.repeatInterval),
                             alarm.repeatInterval, alarm.operation, batch.standalone, true,
                             alarm.workSource, alarm.alarmClock, alarm.userId);
+                }
 
-                    // For now we count this as a wakeup alarm, meaning it needs to be
-                    // delivered immediately.  In the future we should change this, but
-                    // that required delaying when we reschedule the repeat...!
-                    hasWakeup = false;
-                } else if (alarm.wakeup) {
+                if (alarm.wakeup) {
                     hasWakeup = true;
                 }