commit b836ddef159fdd239320a9645f3a5e5ea0ea9e7d
author Jason Monk <jmonk@google.com> Fri Sep 05 13:39:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 13:39:23 2014 +0000
tree 910ecff805c9c8cd47cb6aaae8c53434ecb328d5
parent fdd04d42d2a0fe71236ba0a611ab550f52d8dd35
parent acb8dfe0a692883d56a787171cf350c24549beff

Merge "Allow downtime to exit from no interruptions" into lmp-dev

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

diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java
index 189131c..05ad1fe 100644
--- a/services/core/java/com/android/server/notification/ConditionProviders.java
+++ b/services/core/java/com/android/server/notification/ConditionProviders.java
@@ -545,8 +545,9 @@
                 setZenModeCondition(condition, "downtime");
             }
             // exit downtime
-            if (!inDowntime && mode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
-                    && mDowntime.isDowntimeCondition(mExitCondition)) {
+            if (!inDowntime && mDowntime.isDowntimeCondition(mExitCondition)
+                    && (mode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
+                                || mode == Global.ZEN_MODE_NO_INTERRUPTIONS)) {
                 mZenModeHelper.setZenMode(Global.ZEN_MODE_OFF, "downtimeExit");
             }
         }