Merge "audio: add missing audio device type enums" (474aca35) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4412,6 +4412,10 @@ public class AudioManager {
	* The audio output device code for built-in FM transmitter.		* The audio output device code for built-in FM transmitter.
	*/		*/
	public static final int DEVICE_OUT_FM = AudioSystem.DEVICE_OUT_FM;		public static final int DEVICE_OUT_FM = AudioSystem.DEVICE_OUT_FM;
			/** @hide
			* The audio output device code for echo reference injection point.
			*/
			public static final int DEVICE_OUT_ECHO_CANCELLER = AudioSystem.DEVICE_OUT_ECHO_CANCELLER;
	/** @hide		/** @hide
	* The audio output device code for a BLE audio headset.		* The audio output device code for a BLE audio headset.
	*/		*/
	@@ -4504,6 +4508,10 @@ public class AudioManager {
	* The audio input device code for audio loopback		* The audio input device code for audio loopback
	*/		*/
	public static final int DEVICE_IN_LOOPBACK = AudioSystem.DEVICE_IN_LOOPBACK;		public static final int DEVICE_IN_LOOPBACK = AudioSystem.DEVICE_IN_LOOPBACK;
			/** @hide
			* The audio input device code for an echo reference capture point.
			*/
			public static final int DEVICE_IN_ECHO_REFERENCE = AudioSystem.DEVICE_IN_ECHO_REFERENCE;
	/** @hide		/** @hide
	* The audio input device code for a BLE audio headset.		* The audio input device code for a BLE audio headset.
	*/		*/

media/java/android/media/AudioSystem.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -867,6 +867,8 @@ public class AudioSystem
	/** @hide */		/** @hide */
	public static final int DEVICE_OUT_HEARING_AID = 0x8000000;		public static final int DEVICE_OUT_HEARING_AID = 0x8000000;
	/** @hide */		/** @hide */
			public static final int DEVICE_OUT_ECHO_CANCELLER = 0x10000000;
			/** @hide */
	public static final int DEVICE_OUT_BLE_HEADSET = 0x20000000;		public static final int DEVICE_OUT_BLE_HEADSET = 0x20000000;
	/** @hide */		/** @hide */
	public static final int DEVICE_OUT_BLE_SPEAKER = 0x20000001;		public static final int DEVICE_OUT_BLE_SPEAKER = 0x20000001;
	@@ -926,6 +928,7 @@ public class AudioSystem
	DEVICE_OUT_ALL_SET.add(DEVICE_OUT_PROXY);		DEVICE_OUT_ALL_SET.add(DEVICE_OUT_PROXY);
	DEVICE_OUT_ALL_SET.add(DEVICE_OUT_USB_HEADSET);		DEVICE_OUT_ALL_SET.add(DEVICE_OUT_USB_HEADSET);
	DEVICE_OUT_ALL_SET.add(DEVICE_OUT_HEARING_AID);		DEVICE_OUT_ALL_SET.add(DEVICE_OUT_HEARING_AID);
			DEVICE_OUT_ALL_SET.add(DEVICE_OUT_ECHO_CANCELLER);
	DEVICE_OUT_ALL_SET.add(DEVICE_OUT_BLE_HEADSET);		DEVICE_OUT_ALL_SET.add(DEVICE_OUT_BLE_HEADSET);
	DEVICE_OUT_ALL_SET.add(DEVICE_OUT_BLE_SPEAKER);		DEVICE_OUT_ALL_SET.add(DEVICE_OUT_BLE_SPEAKER);
	DEVICE_OUT_ALL_SET.add(DEVICE_OUT_DEFAULT);		DEVICE_OUT_ALL_SET.add(DEVICE_OUT_DEFAULT);
	@@ -1133,6 +1136,7 @@ public class AudioSystem
	/** @hide */ public static final String DEVICE_OUT_PROXY_NAME = "proxy";		/** @hide */ public static final String DEVICE_OUT_PROXY_NAME = "proxy";
	/** @hide */ public static final String DEVICE_OUT_USB_HEADSET_NAME = "usb_headset";		/** @hide */ public static final String DEVICE_OUT_USB_HEADSET_NAME = "usb_headset";
	/** @hide */ public static final String DEVICE_OUT_HEARING_AID_NAME = "hearing_aid_out";		/** @hide */ public static final String DEVICE_OUT_HEARING_AID_NAME = "hearing_aid_out";
			/** @hide */ public static final String DEVICE_OUT_ECHO_CANCELLER_NAME = "echo_canceller";
	/** @hide */ public static final String DEVICE_OUT_BLE_HEADSET_NAME = "ble_headset";		/** @hide */ public static final String DEVICE_OUT_BLE_HEADSET_NAME = "ble_headset";
	/** @hide */ public static final String DEVICE_OUT_BLE_SPEAKER_NAME = "ble_speaker";		/** @hide */ public static final String DEVICE_OUT_BLE_SPEAKER_NAME = "ble_speaker";

	@@ -1225,6 +1229,8 @@ public class AudioSystem
	return DEVICE_OUT_USB_HEADSET_NAME;		return DEVICE_OUT_USB_HEADSET_NAME;
	case DEVICE_OUT_HEARING_AID:		case DEVICE_OUT_HEARING_AID:
	return DEVICE_OUT_HEARING_AID_NAME;		return DEVICE_OUT_HEARING_AID_NAME;
			case DEVICE_OUT_ECHO_CANCELLER:
			return DEVICE_OUT_ECHO_CANCELLER_NAME;
	case DEVICE_OUT_BLE_HEADSET:		case DEVICE_OUT_BLE_HEADSET:
	return DEVICE_OUT_BLE_HEADSET_NAME;		return DEVICE_OUT_BLE_HEADSET_NAME;
	case DEVICE_OUT_BLE_SPEAKER:		case DEVICE_OUT_BLE_SPEAKER: