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

Commit 4fdac613 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new... 

am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
automerge: 29039a2b

* commit '29039a2b':
  Always re-establish kernel alarms when considering new alarm set
parents ba87ba5e 29039a2b

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

+4 −2
Original line number Diff line number Diff line
@@ -1230,7 +1230,8 @@ class AlarmManagerService extends SystemService { 
        if (mAlarmBatches.size() > 0) {

            final Batch firstWakeup = findFirstWakeupBatchLocked();

            final Batch firstBatch = mAlarmBatches.get(0);

            if (firstWakeup != null && mNextWakeup != firstWakeup.start) {

            // always update the kernel alarms, as a backstop against missed wakeups

            if (firstWakeup != null) {

                mNextWakeup = firstWakeup.start;

                setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start);

            }
@@ -1243,7 +1244,8 @@ class AlarmManagerService extends SystemService { 
                nextNonWakeup = mNextNonWakeupDeliveryTime;

            }

        }

        if (nextNonWakeup != 0 && mNextNonWakeup != nextNonWakeup) {

        // always update the kernel alarm, as a backstop against missed wakeups

        if (nextNonWakeup != 0) {

            mNextNonWakeup = nextNonWakeup;

            setLocked(ELAPSED_REALTIME, nextNonWakeup);

        }