diff options
| author | 2017-09-20 20:02:05 +0000 | |
|---|---|---|
| committer | 2017-09-20 20:02:05 +0000 | |
| commit | 082e11b28db6d1da074dad8a12591fabfce378ab (patch) | |
| tree | 1ee6f97dfdba6ab90d07c8d0cd3319b4b6a67c26 | |
| parent | 098dae1b3ef9b2948d230435e072d473aa408013 (diff) | |
| parent | 837697a82f65e9a6865d9a37dda4ec6520d1e6cc (diff) | |
Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/notification/ScheduleCalendar.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/notification/ScheduleCalendar.java b/services/core/java/com/android/server/notification/ScheduleCalendar.java index 9e8b2e34520b..40230bd2ba82 100644 --- a/services/core/java/com/android/server/notification/ScheduleCalendar.java +++ b/services/core/java/com/android/server/notification/ScheduleCalendar.java @@ -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; } } |