Merge "Add audio device type AUDIO_DEVICE_IN_HDMI_ARC" (6364e04b) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3801,6 +3801,12 @@ public class AudioManager {
	*/		*/
	public static final int DEVICE_IN_HDMI =		public static final int DEVICE_IN_HDMI =
	AudioSystem.DEVICE_IN_HDMI;		AudioSystem.DEVICE_IN_HDMI;
			/** @hide
			* The audio input device code for HDMI ARC
			*/
			public static final int DEVICE_IN_HDMI_ARC =
			AudioSystem.DEVICE_IN_HDMI_ARC;

	/** @hide		/** @hide
	* The audio input device code for telephony voice RX path		* The audio input device code for telephony voice RX path
	*/		*/

media/java/android/media/AudioSystem.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -542,6 +542,7 @@ public class AudioSystem
	public static final int DEVICE_IN_PROXY = DEVICE_BIT_IN \| 0x1000000;		public static final int DEVICE_IN_PROXY = DEVICE_BIT_IN \| 0x1000000;
	public static final int DEVICE_IN_USB_HEADSET = DEVICE_BIT_IN \| 0x2000000;		public static final int DEVICE_IN_USB_HEADSET = DEVICE_BIT_IN \| 0x2000000;
	public static final int DEVICE_IN_BLUETOOTH_BLE = DEVICE_BIT_IN \| 0x4000000;		public static final int DEVICE_IN_BLUETOOTH_BLE = DEVICE_BIT_IN \| 0x4000000;
			public static final int DEVICE_IN_HDMI_ARC = DEVICE_BIT_IN \| 0x8000000;
	public static final int DEVICE_IN_ECHO_REFERENCE = DEVICE_BIT_IN \| 0x10000000;		public static final int DEVICE_IN_ECHO_REFERENCE = DEVICE_BIT_IN \| 0x10000000;
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final int DEVICE_IN_DEFAULT = DEVICE_BIT_IN \| DEVICE_BIT_DEFAULT;		public static final int DEVICE_IN_DEFAULT = DEVICE_BIT_IN \| DEVICE_BIT_DEFAULT;
	@@ -570,6 +571,7 @@ public class AudioSystem
	DEVICE_IN_PROXY \|		DEVICE_IN_PROXY \|
	DEVICE_IN_USB_HEADSET \|		DEVICE_IN_USB_HEADSET \|
	DEVICE_IN_BLUETOOTH_BLE \|		DEVICE_IN_BLUETOOTH_BLE \|
			DEVICE_IN_HDMI_ARC \|
	DEVICE_IN_ECHO_REFERENCE \|		DEVICE_IN_ECHO_REFERENCE \|
	DEVICE_IN_DEFAULT);		DEVICE_IN_DEFAULT);
	public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET;		public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET;
	@@ -647,6 +649,7 @@ public class AudioSystem
	public static final String DEVICE_IN_USB_HEADSET_NAME = "usb_headset";		public static final String DEVICE_IN_USB_HEADSET_NAME = "usb_headset";
	public static final String DEVICE_IN_BLUETOOTH_BLE_NAME = "bt_ble";		public static final String DEVICE_IN_BLUETOOTH_BLE_NAME = "bt_ble";
	public static final String DEVICE_IN_ECHO_REFERENCE_NAME = "echo_reference";		public static final String DEVICE_IN_ECHO_REFERENCE_NAME = "echo_reference";
			public static final String DEVICE_IN_HDMI_ARC_NAME = "hdmi_arc";

	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static String getOutputDeviceName(int device)		public static String getOutputDeviceName(int device)
	@@ -767,6 +770,8 @@ public class AudioSystem
	return DEVICE_IN_BLUETOOTH_BLE_NAME;		return DEVICE_IN_BLUETOOTH_BLE_NAME;
	case DEVICE_IN_ECHO_REFERENCE:		case DEVICE_IN_ECHO_REFERENCE:
	return DEVICE_IN_ECHO_REFERENCE_NAME;		return DEVICE_IN_ECHO_REFERENCE_NAME;
			case DEVICE_IN_HDMI_ARC:
			return DEVICE_IN_HDMI_ARC_NAME;
	case DEVICE_IN_DEFAULT:		case DEVICE_IN_DEFAULT:
	default:		default:
	return Integer.toString(device);		return Integer.toString(device);