diff options
| author | Addison Nuding <addison@google.com> | 2016-03-01 04:56:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-01 04:56:34 +0000 |
| commit | bce5740a3c50d126a13cb4709fd7287449cc6e86 (patch) | |
| tree | 145383aa5ced47e54c0fdcd7b8032cf1ad62b05a | |
| parent | 9ad1bd517317d9739702eb4da49cfc38623a7594 (diff) | |
| parent | b1ba2c512cc598ee7bcdc5b3919899b0a08b252f (diff) | |
| download | base-bce5740a3c50d126a13cb4709fd7287449cc6e86.tar.gz | |
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr-ryu-dev
| -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(); |