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

am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev

Browse Source 
* commit '39838b98f1fef11ff29bf682029331849a39a633':
  Zen: Fix downtime calculation for Sunday mornings.
This commit is contained in:
John Spurlock
2014-09-29 20:49:29 +00:00
committed by Android Git Automerger
parent 5f5255c42c 39838b98f1
commit cbb732a8c4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/DowntimeConditionProvider.java
View File

@@ -193,7 +193,8 @@ public class DowntimeConditionProvider extends ConditionProviderService {
} }
private boolean isInDowntime(int daysOffset, long time, long start, long end) { private boolean isInDowntime(int daysOffset, long time, long start, long end) {
final int day = ((getDayOfWeek(time) + daysOffset - 1) % Calendar.SATURDAY) + 1; final int n = Calendar.SATURDAY;
final int day = ((getDayOfWeek(time) - 1) + (daysOffset % n) + n) % n + 1;
start = addDays(start, daysOffset); start = addDays(start, daysOffset);
end = addDays(end, daysOffset); end = addDays(end, daysOffset);
return mDays.contains(day) && time >= start && time < end; return mDays.contains(day) && time >= start && time < end;