diff options
| author | Eric Laurent <elaurent@google.com> | 2009-12-22 17:42:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-22 17:42:17 -0800 |
| commit | 68e9014e47f7350b3889e1704dde809b2a926968 (patch) | |
| tree | 5e2a33ee19b3b55b52beff06378e0b020b4b6d49 /media | |
| parent | 49a791a08b074aac438f8b6b32ae8c2860717447 (diff) | |
| parent | 484d2888680e18e6ad8c3fcc51e3b70a705a096e (diff) | |
| download | frameworks_base-68e9014e47f7350b3889e1704dde809b2a926968.zip frameworks_base-68e9014e47f7350b3889e1704dde809b2a926968.tar.gz frameworks_base-68e9014e47f7350b3889e1704dde809b2a926968.tar.bz2 | |
am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp
* commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e':
Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index e5837ee..96d7027 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -168,7 +168,7 @@ public class AudioService extends IAudioService.Stub { AudioSystem.STREAM_MUSIC, // STREAM_MUSIC AudioSystem.STREAM_ALARM, // STREAM_ALARM AudioSystem.STREAM_NOTIFICATION, // STREAM_NOTIFICATION - AudioSystem.STREAM_VOICE_CALL, // STREAM_BLUETOOTH_SCO + AudioSystem.STREAM_BLUETOOTH_SCO, // STREAM_BLUETOOTH_SCO AudioSystem.STREAM_SYSTEM, // STREAM_SYSTEM_ENFORCED AudioSystem.STREAM_VOICE_CALL, // STREAM_DTMF AudioSystem.STREAM_MUSIC // STREAM_TTS |