commit 3f62358b7e3a35f6f9c68aac09889e5d47bc6d2a
author Zach Johnson <zachoverflow@google.com> Tue Aug 25 19:16:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 25 19:16:43 2015 +0000
tree 3c3d32b98716bc6a7140c48c63a779bdf1699f4d
parent 30275c1924b2bd45b05bd9c98f8648ecbc71374f
parent f1b48144a970807d4cb63c308f9a38de535f92ed

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

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

diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 57d7758..2fda745 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -411,8 +411,7 @@
         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