summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-12 22:45:50 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-12 22:45:50 -0800
commit1aaa563c2cb0df3f414aa0cfc13f9ae7b457dc49 (patch)
tree579f2ef0890c1595d9d164b6cdfdda4585dd1de7 /include/media
parent1dfc99f22fb9d8c798065938c24eeb4eb9691747 (diff)
parent0f2d1e2dd7601e06fdf834f3f942eeb5c8b33a15 (diff)
downloadframeworks_av-1aaa563c2cb0df3f414aa0cfc13f9ae7b457dc49.zip
frameworks_av-1aaa563c2cb0df3f414aa0cfc13f9ae7b457dc49.tar.gz
frameworks_av-1aaa563c2cb0df3f414aa0cfc13f9ae7b457dc49.tar.bz2
Merge change I923d7d72 into eclair
* changes: Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
Diffstat (limited to 'include/media')
-rw-r--r--include/media/AudioSystem.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index e066177..bc3dd36 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -239,15 +239,11 @@ public:
DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = 0x100,
DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = 0x200,
DEVICE_OUT_AUX_DIGITAL = 0x400,
- DEVICE_OUT_FM_HEADPHONE = 0x800,
- DEVICE_OUT_FM_SPEAKER = 0x1000,
- DEVICE_OUT_TTY = 0x2000,
DEVICE_OUT_DEFAULT = 0x8000,
DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE | DEVICE_OUT_SPEAKER | DEVICE_OUT_WIRED_HEADSET |
DEVICE_OUT_WIRED_HEADPHONE | DEVICE_OUT_BLUETOOTH_SCO | DEVICE_OUT_BLUETOOTH_SCO_HEADSET |
DEVICE_OUT_BLUETOOTH_SCO_CARKIT | DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |
- DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL | DEVICE_OUT_FM_HEADPHONE |
- DEVICE_OUT_FM_SPEAKER | DEVICE_OUT_TTY | DEVICE_OUT_DEFAULT),
+ DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL | DEVICE_OUT_DEFAULT),
// input devices
DEVICE_IN_COMMUNICATION = 0x10000,