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

Don't exit dnd rule for old alarms

Browse Source 
Bug: 77209521
Test: atest ScheduleCalendarTest
Change-Id: I394a6a74872f76f90b75238593197bb6c50531ef
This commit is contained in:
Beverly
2018-03-29 18:14:04 -04:00
parent f0e720ecde
commit 369dd4257c
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/service/notification/ScheduleCalendar.java
View File

@@ -144,7 +144,8 @@ public class ScheduleCalendar {
}
return mSchedule.exitAtAlarm
&& mSchedule.nextAlarm != 0
&& time >= mSchedule.nextAlarm;
&& time >= mSchedule.nextAlarm
&& isInSchedule(mSchedule.nextAlarm);
}
private boolean isInSchedule(int daysOffset, long time, long start, long end) {

25
services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java
View File

@@ -205,6 +205,31 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
assertTrue(mScheduleCalendar.shouldExitForAlarm(1000));
}
@Test
public void testShouldExitForAlarm_oldAlarm() {
// Cal: today 2:15pm
Calendar cal = new GregorianCalendar();
cal.set(Calendar.HOUR_OF_DAY, 14);
cal.set(Calendar.MINUTE, 15);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
// ScheduleInfo: today 12:16pm - today 3:15pm
mScheduleInfo.days = new int[] {getTodayDay()};
mScheduleInfo.startHour = 12;
mScheduleInfo.endHour = 3;
mScheduleInfo.startMinute = 16;
mScheduleInfo.endMinute = 15;
mScheduleInfo.exitAtAlarm = true;
mScheduleInfo.nextAlarm = 1000; // very old alarm
mScheduleCalendar.setSchedule(mScheduleInfo);
assertTrue(mScheduleCalendar.isInSchedule(cal.getTimeInMillis()));
// don't exit for an alarm if it's an old alarm
assertFalse(mScheduleCalendar.shouldExitForAlarm(1000));
}
@Test
public void testMaybeSetNextAlarm_settingOff() {
mScheduleInfo.exitAtAlarm = false;