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

Commit 97b9903b 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 

am: 496c31de

Change-Id: Id31b145e0a78b82e6ab22dfe305b145a121f6282
parents 286165ad 496c31de

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;

            }

        }