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

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

View File

@@ -413,8 +413,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