diff options
| author | 2017-06-21 17:30:53 +0000 | |
|---|---|---|
| committer | 2017-06-21 17:30:53 +0000 | |
| commit | 341bccf7863ad4d469f6a589ebf38c03339f233d (patch) | |
| tree | 0aff55e1134e9550959b02bb49cb2bcadcb5d530 | |
| parent | 3245530ba18413b17e340970f1a9ecc9f841a44d (diff) | |
| parent | 34bc810b0b9b986b3ea28cafd5b070b4b39e699c (diff) | |
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am: 9f1494368b
am: 34bc810b0b
Change-Id: I55c12d8767efa48ac596679e1c967a015d597a60
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/notification/ZenModeHelper.java | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index e36ceb8a3e13..c1e81c54f117 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -194,6 +194,12 @@ public final class AudioAttributes implements Parcelable { * @see #SUPPRESSIBLE_USAGES */ 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 @@ -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_DELAYED,SUPPRESSIBLE_NOTIFICATION); SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_EVENT, SUPPRESSIBLE_NOTIFICATION); + SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_ACCESSIBILITY, SUPPRESSIBLE_NEVER); } /** diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 75190f3e3e89..15e32ff6469e 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -762,7 +762,9 @@ public class ZenModeHelper { for (int usage : AudioAttributes.SDK_USAGES) { 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); } else if (suppressionBehavior == AudioAttributes.SUPPRESSIBLE_CALL) { applyRestrictions(muteCalls || muteEverything, usage); |