Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zach Johnson
2015-08-25 19:16:43 +00:00
committed by Android (Google) Code Review
parent 30275c1924 f1b48144a9
commit 3f62358b7e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -411,8 +411,7 @@ public class ZenModeHelper {
applyRestrictions(muteNotifications, USAGE_NOTIFICATION); applyRestrictions(muteNotifications, USAGE_NOTIFICATION);
// call restrictions // call restrictions
final boolean muteCalls = zen && !mConfig.allowCalls && !mConfig.allowRepeatCallers final boolean muteCalls = zen && !mConfig.allowCalls && !mConfig.allowRepeatCallers;
|| mEffectsSuppressed;
applyRestrictions(muteCalls, USAGE_NOTIFICATION_RINGTONE); applyRestrictions(muteCalls, USAGE_NOTIFICATION_RINGTONE);
// alarm restrictions // alarm restrictions