Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8965a8da authored by Christopher Tate's avatar Christopher Tate Committed by Bart Sears
Browse files

Properly recognize repeating wakeup alarms 

cherry-pick from lmp-mr1-dev

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit 864d42eb)
parent c82392df

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

+2 −5
Original line number Diff line number Diff line
@@ -1425,12 +1425,9 @@ class AlarmManagerService extends SystemService { 
                            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;

                }