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

* commit '3f62358b7e3a35f6f9c68aac09889e5d47bc6d2a':
  *ring ring* Who is it? Destiny? I've been expecting your call...
This commit is contained in:
Zach Johnson
2015-08-25 19:22:11 +00:00
committed by Android Git Automerger

View File

@@ -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