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

Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev

Browse Source 
am: c2ec3f1bbe

* commit 'c2ec3f1bbe7271be2126b48fc94acc42a37f43f2':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
This commit is contained in:
Daniel Sandler
2016-01-07 18:13:07 +00:00
committed by android-build-merger
parent 4329dd6a62 c2ec3f1bbe
commit f61708617c
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

@@ -509,7 +509,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();