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

Commit 700d1fbd authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 401f68b9: am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does... 

am 401f68b9: am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

* commit '401f68b9':
  Fix issue #24571425: Device does not come out of idle mode for maintenance
parents d76757d7 401f68b9

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -971,8 +971,8 @@ class AlarmManagerService extends SystemService { 
            // This is a special alarm that will put the system into idle until it goes off.

            // This is a special alarm that will put the system into idle until it goes off.

            // The caller has given the time they want this to happen at, however we need

            // The caller has given the time they want this to happen at, however we need

            // to pull that earlier if there are existing alarms that have requested to

            // to pull that earlier if there are existing alarms that have requested to

            // bring us out of idle.

            // bring us out of idle at an earlier time.

            if (mNextWakeFromIdle != null) {

            if (mNextWakeFromIdle != null && a.whenElapsed > mNextWakeFromIdle.whenElapsed) {

                a.when = a.whenElapsed = a.maxWhenElapsed = mNextWakeFromIdle.whenElapsed;

                a.when = a.whenElapsed = a.maxWhenElapsed = mNextWakeFromIdle.whenElapsed;

            }

            }

            // Add fuzz to make the alarm go off some time before the actual desired time.

            // Add fuzz to make the alarm go off some time before the actual desired time.