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

Commit 496c31de authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev 

am: 082e11b2

Change-Id: I5fad835e1327d9ebdc29c268124525153d5d7aa0
parents 1f8c8eab 082e11b2

services/core/java/com/android/server/notification/ScheduleCalendar.java

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ public class ScheduleCalendar { 


    public void maybeSetNextAlarm(long now, long nextAlarm) {

        if (mSchedule != null) {

            if (mSchedule.exitAtAlarm && now > mSchedule.nextAlarm) {

            if (mSchedule.exitAtAlarm

                    && (now > mSchedule.nextAlarm || nextAlarm < mSchedule.nextAlarm)) {

                mSchedule.nextAlarm = nextAlarm;

            }

        }