diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-12 22:45:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-12 22:45:50 -0800 |
| commit | 1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54 (patch) | |
| tree | e98594a27996fdf11fa7a643895e513b28c7ba7d /include | |
| parent | 5f8f1487be78064e8d653dd2d105d8dd444d6a35 (diff) | |
| parent | 923d7d721d37f6ba5148e7d79d61a4fa48e79df2 (diff) | |
| download | frameworks_base-1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54.zip frameworks_base-1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54.tar.gz frameworks_base-1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54.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')
| -rw-r--r-- | include/media/AudioSystem.h | 6 |
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, |