commit 3ec6a91204ffac6e81eaad7ca29e817e9502f856
author Bart Sears <bsears@google.com> Fri Dec 12 01:52:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 12 01:52:31 2014 +0000
tree 99e2cb495b471811e5d931aadcc87c93fedf3903
parent 8965a8da5513cf31a313ecdac3506718c2813932
parent b62aa5530ef2ec17177bb54018c5cda3080c94bc

Merge "Tune delivery and batching of alarms" into lmp-dev

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 9870d9a..ed8bc51 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -1465,12 +1465,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;
                 }