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

Commit 125579ca authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 

* commit '012de64e':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
parents 0e954dcc 012de64e

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

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ class AlarmManagerService extends SystemService { 
        if (mLastAlarmDeliveryTime <= 0) {

            return false;

        }

        if (mPendingNonWakeupAlarms.size() > 0 && mNextNonWakeupDeliveryTime > nowELAPSED) {

        if (mPendingNonWakeupAlarms.size() > 0 && mNextNonWakeupDeliveryTime < nowELAPSED) {

            // This is just a little paranoia, if somehow we have pending non-wakeup alarms

            // and the next delivery time is in the past, then just deliver them all.  This

            // avoids bugs where we get stuck in a loop trying to poll for alarms.