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

Merge "Override old alarms in zen schedule" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-20 20:09:39 +00:00
committed by Android (Google) Code Review
parent b4b64ad602 7ee646771b
commit 2ab75b2b2e
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,10 +70,10 @@ public class ScheduleCalendar {
}
// only allow alarms in the future
if (nextAlarm > now) {
// store earliest alarm
if (mSchedule.nextAlarm == 0) {
if (mSchedule.nextAlarm == 0 || mSchedule.nextAlarm < now) {
mSchedule.nextAlarm = nextAlarm;
} else {
// store earliest alarm
mSchedule.nextAlarm = Math.min(mSchedule.nextAlarm, nextAlarm);
}
} else if (mSchedule.nextAlarm < now) {

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

@@ -332,6 +332,17 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
assertEquals(0, mScheduleInfo.nextAlarm);
}
@Test
public void testMaybeSetNextAlarm_expiredOldAlarm() {
mScheduleInfo.exitAtAlarm = true;
mScheduleInfo.nextAlarm = 998;
mScheduleCalendar.setSchedule(mScheduleInfo);
mScheduleCalendar.maybeSetNextAlarm(1000, 1001);
assertEquals(1001, mScheduleInfo.nextAlarm);
}
@Test
@FlakyTest
public void testIsInSchedule_inScheduleOvernight() {