Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeac1f1d authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

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

* commit 'cbb732a8':
  Zen: Fix downtime calculation for Sunday mornings.
parents 8f3fdc24 cbb732a8

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

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ public class DowntimeConditionProvider extends ConditionProviderService { 
    }



    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;