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

2014-09-05 13:39:22 +00:00
parent fdd04d42d2 acb8dfe0a6
commit b836ddef15
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/notification/ConditionProviders.java
+++ b/services/core/java/com/android/server/notification/ConditionProviders.java
@@ -545,8 +545,9 @@ public class ConditionProviders extends ManagedServices {
                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");
            }
        }