Allow downtime to exit from no interruptions

Since the user can specify it to exit from no interruptions, it
needs to actually exit.

Bug: 17331112
Change-Id: I9a8412e5b42af17e79798f5ea4bcf3e19924cc93
This commit is contained in:
Jason Monk
2014-09-04 10:40:08 -04:00
parent f6478d4c0a
commit acb8dfe0a6

View File

@@ -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");
}
}