Merge "*ring ring* Who is it? Destiny? I've been expecting your call..." into cw-e-dev

2015-08-25 19:16:43 +00:00
parent 30275c1924 f1b48144a9
commit 3f62358b7e
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -411,8 +411,7 @@ public class ZenModeHelper {
        applyRestrictions(muteNotifications, USAGE_NOTIFICATION);

        // call restrictions
-        final boolean muteCalls = zen && !mConfig.allowCalls && !mConfig.allowRepeatCallers
-                || mEffectsSuppressed;
+        final boolean muteCalls = zen && !mConfig.allowCalls && !mConfig.allowRepeatCallers;
        applyRestrictions(muteCalls, USAGE_NOTIFICATION_RINGTONE);

        // alarm restrictions