diff options
| author | Eric Laurent <elaurent@google.com> | 2009-12-22 23:41:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-22 23:41:59 -0800 |
| commit | f31f365a7708c931e955670bc6213fdc8f91a87a (patch) | |
| tree | 4d1a72347440f4d71519e7ba47c4cd6948ebaa32 /include | |
| parent | 244cc72fdf906799e3ec4cfe5b7cda49d9f08cca (diff) | |
| parent | eb5ffc239b6482b9c1e046f6f5872187043d852c (diff) | |
| download | frameworks_base-f31f365a7708c931e955670bc6213fdc8f91a87a.zip frameworks_base-f31f365a7708c931e955670bc6213fdc8f91a87a.tar.gz frameworks_base-f31f365a7708c931e955670bc6213fdc8f91a87a.tar.bz2 | |
am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp
* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
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 }; |