Merge "Change suppresible type of voice comm signalling" into qt-dev (e0d4554f) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioAttributes.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -222,10 +222,10 @@ public final class AudioAttributes implements Parcelable {
		public final static int SUPPRESSIBLE_MEDIA = 5;
		/**
		* @hide
		* Denotes a usage for all other sounds not caught in SUPPRESSIBLE_NOTIFICATION,
		* Denotes a usage for sounds not caught in SUPPRESSIBLE_NOTIFICATION,
		* SUPPRESSIBLE_CALL,SUPPRESSIBLE_NEVER, SUPPRESSIBLE_ALARM or SUPPRESSIBLE_MEDIA.
		* This includes system, sonification and unknown sounds.
		* These will be muted when the Zen priority mode doesn't allow sytem sounds
		* This includes sonification sounds.
		* These will be muted when the Zen priority mode doesn't allow system sounds
		* @see #SUPPRESSIBLE_USAGES
		*/
		public final static int SUPPRESSIBLE_SYSTEM = 6;
		@@ -248,6 +248,7 @@ public final class AudioAttributes implements Parcelable {
		SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_EVENT, SUPPRESSIBLE_NOTIFICATION);
		SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_ACCESSIBILITY, SUPPRESSIBLE_NEVER);
		SUPPRESSIBLE_USAGES.put(USAGE_VOICE_COMMUNICATION, SUPPRESSIBLE_NEVER);
		SUPPRESSIBLE_USAGES.put(USAGE_VOICE_COMMUNICATION_SIGNALLING, SUPPRESSIBLE_NEVER);
		SUPPRESSIBLE_USAGES.put(USAGE_ALARM, SUPPRESSIBLE_ALARM);
		SUPPRESSIBLE_USAGES.put(USAGE_MEDIA, SUPPRESSIBLE_MEDIA);
		SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, SUPPRESSIBLE_MEDIA);
		@@ -255,7 +256,6 @@ public final class AudioAttributes implements Parcelable {
		SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANT, SUPPRESSIBLE_MEDIA);
		/** default volume assignment is STREAM_MUSIC, handle unknown usage as media */
		SUPPRESSIBLE_USAGES.put(USAGE_UNKNOWN, SUPPRESSIBLE_MEDIA);
		SUPPRESSIBLE_USAGES.put(USAGE_VOICE_COMMUNICATION_SIGNALLING, SUPPRESSIBLE_SYSTEM);
		SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_SONIFICATION, SUPPRESSIBLE_SYSTEM);
		}