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

Commit 082e11b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 098dae1b 837697a8

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;

            }

        }