commit 8d9aea8a1870ad83d9eccba1068a1685da5e96d0
author Dan Sandler <dsandler@android.com> Tue Dec 29 15:45:39 2015 -0500
committer Daniel Sandler <dsandler@android.com> Thu Jan 07 18:09:11 2016 +0000
tree 9062be2552c3c44e5320b27b3da80d1a5b6eb7f0
parent b805bb8b660c5897e7a379fb2d79815269039271

DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.

Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.

Bug: 26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8

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

diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index 1156d03..01d2ca0 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -509,7 +509,7 @@
         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();