Skip to content

Commit d8826bc

Browse files
author
John Spurlock
committed
Zen: Fix downtime calculation for Sunday mornings.
Previous calculation would always exit downtime on Sunday mornings, due to the target day ending up at zero (an invalid day). Bug:17682999 Change-Id: Icc5f01a42c3c644170eea9e60442cf77ce15a06c
1 parent 311fc0b commit d8826bc

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

services/core/java/com/android/server/notification/DowntimeConditionProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ private boolean isInDowntime(long time) {
193193
}
194194

195195
private boolean isInDowntime(int daysOffset, long time, long start, long end) {
196-
final int day = ((getDayOfWeek(time) + daysOffset - 1) % Calendar.SATURDAY) + 1;
196+
final int n = Calendar.SATURDAY;
197+
final int day = ((getDayOfWeek(time) - 1) + (daysOffset % n) + n) % n + 1;
197198
start = addDays(start, daysOffset);
198199
end = addDays(end, daysOffset);
199200
return mDays.contains(day) && time >= start && time < end;

0 commit comments

Comments
 (0)