diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2009-12-10 16:46:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 16:46:13 -0800 |
| commit | 6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b (patch) | |
| tree | 7e910c16a5c3278b3d636948446bf382fa44cb21 /include | |
| parent | 8f31c23021a3f8164eee08cf904c3f083ddfc3d2 (diff) | |
| parent | 86ed86d2260932bdf2217b1d8431ac9e04d47534 (diff) | |
| download | frameworks_base-6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b.zip frameworks_base-6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b.tar.gz frameworks_base-6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b.tar.bz2 | |
am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2
* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
Partially fix bug 2111240 Detect docking / undocking event by reporting
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index bc3dd36..29aaa3f 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -282,6 +282,7 @@ public: FORCE_BT_SCO, FORCE_BT_A2DP, FORCE_WIRED_ACCESSORY, + FORCE_BT_DOCK, NUM_FORCE_CONFIG, FORCE_DEFAULT = FORCE_NONE }; @@ -291,6 +292,7 @@ public: FOR_COMMUNICATION, FOR_MEDIA, FOR_RECORD, + FOR_DOCK, NUM_FORCE_USE }; |