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 | 368f5743636d24a6ff70a53b6c9073477cd60ede (patch) | |
| tree | d46c73d0233b2baecf3c1cccb24c86d8d51b6ed6 | |
| parent | 9d1447eddd8128f73640cc11ef5aa0b04abaaf5d (diff) | |
| parent | 7ddd450f91dc508b26cc550f5b42fded8a731654 (diff) | |
| download | frameworks_av-368f5743636d24a6ff70a53b6c9073477cd60ede.zip frameworks_av-368f5743636d24a6ff70a53b6c9073477cd60ede.tar.gz frameworks_av-368f5743636d24a6ff70a53b6c9073477cd60ede.tar.bz2 | |
am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp
* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
Fix issues 2333450 and 2333559:
| -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 }; |