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

Commit 9945e1c6 authored by Dan Sandler's avatar Dan Sandler Committed by android-build-merger
Browse files

Merge "Use GregorianCalendar.add() when searching for next alarm." am: b52de824 

am: 65a35016

* commit '65a35016':
  Use GregorianCalendar.add() when searching for next alarm.
parents 6978228c 65a35016

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ public class ZenModePanel extends LinearLayout { 
        GregorianCalendar weekRange = new GregorianCalendar();

        final long now = weekRange.getTimeInMillis();

        setToMidnight(weekRange);

        weekRange.roll(Calendar.DATE, 6);

        weekRange.add(Calendar.DATE, 6);

        final long nextAlarmMs = mController.getNextAlarm();

        if (nextAlarmMs > 0) {

            GregorianCalendar nextAlarm = new GregorianCalendar();