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

Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2014-12-02 23:44:18 +00:00
committed by Android (Google) Code Review
parent 9939136121 864d42eb96
commit 3bec50908b
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

@@ -1445,12 +1445,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;
} }