Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 8d9aea8a18)
This commit is contained in:
Dan Sandler
2015-12-29 15:45:39 -05:00
committed by Akshay Thakker
parent 73ecaf0881
commit e79c73d626
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
View File

@@ -511,7 +511,7 @@ public class ZenModePanel extends LinearLayout {
GregorianCalendar weekRange = new GregorianCalendar(); GregorianCalendar weekRange = new GregorianCalendar();
final long now = weekRange.getTimeInMillis(); final long now = weekRange.getTimeInMillis();
setToMidnight(weekRange); setToMidnight(weekRange);
weekRange.roll(Calendar.DATE, 6); weekRange.add(Calendar.DATE, 6);
final long nextAlarmMs = mController.getNextAlarm(); final long nextAlarmMs = mController.getNextAlarm();
if (nextAlarmMs > 0) { if (nextAlarmMs > 0) {
GregorianCalendar nextAlarm = new GregorianCalendar(); GregorianCalendar nextAlarm = new GregorianCalendar();