Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly recognize repeating wakeup alarms

Browse Source 
automerge: 8965a8d

* commit '8965a8da5513cf31a313ecdac3506718c2813932':
  Properly recognize repeating wakeup alarms
This commit is contained in:
Christopher Tate
2014-12-12 13:14:30 +00:00
committed by android-build-merger
parent d0d76540ae 8965a8da55
commit a91ef1ec04
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -1425,12 +1425,9 @@ class AlarmManagerService extends SystemService {
maxTriggerTime(nowELAPSED, nextElapsed, alarm.repeatInterval), maxTriggerTime(nowELAPSED, nextElapsed, alarm.repeatInterval),
alarm.repeatInterval, alarm.operation, batch.standalone, true, alarm.repeatInterval, alarm.operation, batch.standalone, true,
alarm.workSource, alarm.alarmClock, alarm.userId); alarm.workSource, alarm.alarmClock, alarm.userId);
}
// For now we count this as a wakeup alarm, meaning it needs to be if (alarm.wakeup) {
// delivered immediately. In the future we should change this, but
// that required delaying when we reschedule the repeat...!
hasWakeup = false;
} else if (alarm.wakeup) {
hasWakeup = true; hasWakeup = true;
} }