diff options
| author | Eric Laurent <elaurent@google.com> | 2009-12-22 23:46:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-22 23:46:16 -0800 |
| commit | cf4fc6263c1c24ffa91a65a75edb126143a2617e (patch) | |
| tree | 9a9ee3a1cf2d14ebd4d5b6ce08f9052e0dc57295 /include | |
| parent | ecc1f6eca2a89b5a1d0e0e067e3f270424121546 (diff) | |
| parent | f31f365a7708c931e955670bc6213fdc8f91a87a (diff) | |
| download | frameworks_base-cf4fc6263c1c24ffa91a65a75edb126143a2617e.zip frameworks_base-cf4fc6263c1c24ffa91a65a75edb126143a2617e.tar.gz frameworks_base-cf4fc6263c1c24ffa91a65a75edb126143a2617e.tar.bz2 | |
am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'
* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
Fix issues 2333450 and 2333559:
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 29aaa3f..c87007c 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -282,7 +282,8 @@ public: FORCE_BT_SCO, FORCE_BT_A2DP, FORCE_WIRED_ACCESSORY, - FORCE_BT_DOCK, + FORCE_BT_CAR_DOCK, + FORCE_BT_DESK_DOCK, NUM_FORCE_CONFIG, FORCE_DEFAULT = FORCE_NONE }; |