From 2e1f76a46262cfa59571bbfb46d80364e4f37483 Mon Sep 17 00:00:00 2001 From: Nick Chalko Date: Thu, 25 Oct 2018 10:19:10 -0700 Subject: [PATCH] Add audio device type AUDIO_DEVICE_IN_HDMI_ARC ag/5359018 Bug:117967786 Test: flashall on an atom Change-Id: I197723448716460379da3ec7568c5367bad3b88b --- media/java/android/media/AudioManager.java | 6 ++++++ media/java/android/media/AudioSystem.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 30b5480fba552..202a3cf1d930f 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3801,6 +3801,12 @@ public class AudioManager { */ public static final int 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 * The audio input device code for telephony voice RX path */ diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index de73649d59dce..6b7447901cec1 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -542,6 +542,7 @@ public class AudioSystem 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_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; @UnsupportedAppUsage 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_USB_HEADSET | DEVICE_IN_BLUETOOTH_BLE | + DEVICE_IN_HDMI_ARC | DEVICE_IN_ECHO_REFERENCE | DEVICE_IN_DEFAULT); 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_BLUETOOTH_BLE_NAME = "bt_ble"; public static final String DEVICE_IN_ECHO_REFERENCE_NAME = "echo_reference"; + public static final String DEVICE_IN_HDMI_ARC_NAME = "hdmi_arc"; @UnsupportedAppUsage public static String getOutputDeviceName(int device) @@ -767,6 +770,8 @@ public class AudioSystem return DEVICE_IN_BLUETOOTH_BLE_NAME; case DEVICE_IN_ECHO_REFERENCE: return DEVICE_IN_ECHO_REFERENCE_NAME; + case DEVICE_IN_HDMI_ARC: + return DEVICE_IN_HDMI_ARC_NAME; case DEVICE_IN_DEFAULT: default: return Integer.toString(device);