commit 39838b98f1fef11ff29bf682029331849a39a633
author John Spurlock <jspurlock@google.com> Mon Sep 29 20:04:46 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 29 20:04:47 2014 +0000
tree 7e90f35e038d8668dfa486794ed5bf3d00baf08f
parent 1e6775ebb41ff2b343569c9d21c006fed26d08b3
parent d8826bcb2b7f1d8046d5ce95df059cc2559e9f82

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

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

diff --git a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java
index b71bad8..efe47c3 100644
--- a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java
+++ b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java
@@ -193,7 +193,8 @@
     }
 
     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);
         end = addDays(end, daysOffset);
         return mDays.contains(day) && time >= start && time < end;