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

Merge "DnD: Total silence doesn't suppress A11y" into oc-dev

Browse Source 
am: 9f1494368b

Change-Id: Ic213b2675ee5571449c74b19184da7cb91331c01
This commit is contained in:
Jean-Michel Trivi
2017-06-21 17:23:30 +00:00
committed by android-build-merger
parent 592e85b4fd 9f1494368b
commit 34bc810b0b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/AudioAttributes.java
View File

@@ -194,6 +194,12 @@ public final class AudioAttributes implements Parcelable {
* @see #SUPPRESSIBLE_USAGES * @see #SUPPRESSIBLE_USAGES
*/ */
public final static int SUPPRESSIBLE_CALL = 2; public final static int SUPPRESSIBLE_CALL = 2;
/**
* @hide
* Denotes a usage that is never going to be muted, even in Total Silence.
* @see #SUPPRESSIBLE_USAGES
*/
public final static int SUPPRESSIBLE_NEVER = 3;
/** /**
* @hide * @hide
@@ -211,6 +217,7 @@ public final class AudioAttributes implements Parcelable {
SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_INSTANT,SUPPRESSIBLE_NOTIFICATION); SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_INSTANT,SUPPRESSIBLE_NOTIFICATION);
SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_DELAYED,SUPPRESSIBLE_NOTIFICATION); SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_DELAYED,SUPPRESSIBLE_NOTIFICATION);
SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_EVENT, SUPPRESSIBLE_NOTIFICATION); SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_EVENT, SUPPRESSIBLE_NOTIFICATION);
SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_ACCESSIBILITY, SUPPRESSIBLE_NEVER);
} }
/** /**

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

@@ -762,7 +762,9 @@ public class ZenModeHelper {
for (int usage : AudioAttributes.SDK_USAGES) { for (int usage : AudioAttributes.SDK_USAGES) {
final int suppressionBehavior = AudioAttributes.SUPPRESSIBLE_USAGES.get(usage); final int suppressionBehavior = AudioAttributes.SUPPRESSIBLE_USAGES.get(usage);
if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_NOTIFICATION) { if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_NEVER) {
applyRestrictions(false /*mute*/, usage);
} else if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_NOTIFICATION) {
applyRestrictions(muteNotifications || muteEverything, usage); applyRestrictions(muteNotifications || muteEverything, usage);
} else if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_CALL) { } else if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_CALL) {
applyRestrictions(muteCalls || muteEverything, usage); applyRestrictions(muteCalls || muteEverything, usage);