diff options
| author | Eric Laurent <elaurent@google.com> | 2012-08-28 14:27:29 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-09-07 10:41:03 -0700 |
| commit | 53082eced917e0af8fd06486e824d3ea78bc65b6 (patch) | |
| tree | 59c7442d232d2abdd5a08af5d6f4b014e56c39ba /media/java | |
| parent | 37ee53420ce47860807eb8eaeb454c12fa46797b (diff) | |
| download | frameworks_base-53082eced917e0af8fd06486e824d3ea78bc65b6.zip frameworks_base-53082eced917e0af8fd06486e824d3ea78bc65b6.tar.gz frameworks_base-53082eced917e0af8fd06486e824d3ea78bc65b6.tar.bz2 | |
AudioSystem: new audio device enums
Update audio device enums to match new definitions in
native framework.
Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioSystem.java | 55 |
1 files changed, 44 insertions, 11 deletions
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 1ca0df4..f3a8558 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -188,6 +188,13 @@ public class AudioSystem * AudioPolicyService methods */ + // + // audio device definitions: must be kept in sync with values in system/core/audio.h + // + + // reserved bits + public static final int DEVICE_BIT_IN = 0x80000000; + public static final int DEVICE_BIT_DEFAULT = 0x40000000; // output devices, be sure to update AudioManager.java also public static final int DEVICE_OUT_EARPIECE = 0x1; public static final int DEVICE_OUT_SPEAKER = 0x2; @@ -204,8 +211,9 @@ public class AudioSystem public static final int DEVICE_OUT_DGTL_DOCK_HEADSET = 0x1000; public static final int DEVICE_OUT_USB_ACCESSORY = 0x2000; public static final int DEVICE_OUT_USB_DEVICE = 0x4000; + public static final int DEVICE_OUT_REMOTE_SUBMIX = 0x8000; - public static final int DEVICE_OUT_DEFAULT = 0x8000; + public static final int DEVICE_OUT_DEFAULT = DEVICE_BIT_DEFAULT; public static final int DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE | DEVICE_OUT_SPEAKER | DEVICE_OUT_WIRED_HEADSET | @@ -221,6 +229,7 @@ public class AudioSystem DEVICE_OUT_DGTL_DOCK_HEADSET | DEVICE_OUT_USB_ACCESSORY | DEVICE_OUT_USB_DEVICE | + DEVICE_OUT_REMOTE_SUBMIX | DEVICE_OUT_DEFAULT); public static final int DEVICE_OUT_ALL_A2DP = (DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES | @@ -232,15 +241,36 @@ public class AudioSystem DEVICE_OUT_USB_DEVICE); // input devices - public static final int DEVICE_IN_COMMUNICATION = 0x10000; - public static final int DEVICE_IN_AMBIENT = 0x20000; - public static final int DEVICE_IN_BUILTIN_MIC1 = 0x40000; - public static final int DEVICE_IN_BUILTIN_MIC2 = 0x80000; - public static final int DEVICE_IN_MIC_ARRAY = 0x100000; - public static final int DEVICE_IN_BLUETOOTH_SCO_HEADSET = 0x200000; - public static final int DEVICE_IN_WIRED_HEADSET = 0x400000; - public static final int DEVICE_IN_AUX_DIGITAL = 0x800000; - public static final int DEVICE_IN_DEFAULT = 0x80000000; + public static final int DEVICE_IN_COMMUNICATION = DEVICE_BIT_IN | 0x1; + public static final int DEVICE_IN_AMBIENT = DEVICE_BIT_IN | 0x2; + public static final int DEVICE_IN_BUILTIN_MIC = DEVICE_BIT_IN | 0x4; + public static final int DEVICE_IN_BLUETOOTH_SCO_HEADSET = DEVICE_BIT_IN | 0x8; + public static final int DEVICE_IN_WIRED_HEADSET = DEVICE_BIT_IN | 0x10; + public static final int DEVICE_IN_AUX_DIGITAL = DEVICE_BIT_IN | 0x20; + public static final int DEVICE_IN_VOICE_CALL = DEVICE_BIT_IN | 0x40; + public static final int DEVICE_IN_BACK_MIC = DEVICE_BIT_IN | 0x80; + public static final int DEVICE_IN_REMOTE_SUBMIX = DEVICE_BIT_IN | 0x100; + public static final int DEVICE_IN_ANLG_DOCK_HEADSET = DEVICE_BIT_IN | 0x200; + public static final int DEVICE_IN_DGTL_DOCK_HEADSET = DEVICE_BIT_IN | 0x400; + public static final int DEVICE_IN_USB_ACCESSORY = DEVICE_BIT_IN | 0x800; + public static final int DEVICE_IN_USB_DEVICE = DEVICE_BIT_IN | 0x1000; + public static final int DEVICE_IN_DEFAULT = DEVICE_BIT_IN | DEVICE_BIT_DEFAULT; + + public static final int DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION | + DEVICE_IN_AMBIENT | + DEVICE_IN_BUILTIN_MIC | + DEVICE_IN_BLUETOOTH_SCO_HEADSET | + DEVICE_IN_WIRED_HEADSET | + DEVICE_IN_AUX_DIGITAL | + DEVICE_IN_VOICE_CALL | + DEVICE_IN_BACK_MIC | + DEVICE_IN_REMOTE_SUBMIX | + DEVICE_IN_ANLG_DOCK_HEADSET | + DEVICE_IN_DGTL_DOCK_HEADSET | + DEVICE_IN_USB_ACCESSORY | + DEVICE_IN_USB_DEVICE | + DEVICE_IN_DEFAULT); + public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET; // device states, must match AudioSystem::device_connection_state public static final int DEVICE_STATE_UNAVAILABLE = 0; @@ -262,6 +292,7 @@ public class AudioSystem public static final String DEVICE_OUT_DGTL_DOCK_HEADSET_NAME = "digital_dock"; public static final String DEVICE_OUT_USB_ACCESSORY_NAME = "usb_accessory"; public static final String DEVICE_OUT_USB_DEVICE_NAME = "usb_device"; + public static final String DEVICE_OUT_REMOTE_SUBMIX_NAME = "remote_submix"; public static String getDeviceName(int device) { @@ -296,7 +327,9 @@ public class AudioSystem return DEVICE_OUT_USB_ACCESSORY_NAME; case DEVICE_OUT_USB_DEVICE: return DEVICE_OUT_USB_DEVICE_NAME; - case DEVICE_IN_DEFAULT: + case DEVICE_OUT_REMOTE_SUBMIX: + return DEVICE_OUT_REMOTE_SUBMIX_NAME; + case DEVICE_OUT_DEFAULT: default: return ""; } |