diff options
| author | Dan Sandler <dsandler@android.com> | 2015-12-29 15:45:39 -0500 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-02-16 12:28:29 -0800 |
| commit | 2d78c23e4bdee812679b6de1ec45db879ff268fe (patch) | |
| tree | 6aa039d3f415c013cc19a4913c5a1587af20dfb4 | |
| parent | 6a431eed218a65ead4e8e900368676dd9395b936 (diff) | |
| download | base-2d78c23e4bdee812679b6de1ec45db879ff268fe.tar.gz | |
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
(cherry picked from commit 8d9aea8a1870ad83d9eccba1068a1685da5e96d0)
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 33377149aed8..07ec8435e4e4 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -511,7 +511,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(); |