Merge "DnD: Total silence doesn't suppress A11y" into oc-dev (9f149436) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioAttributes.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);