diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-01-27 18:15:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 18:15:39 -0800 |
| commit | 965f22ba325ea488034174bf76194470a6f0ee52 (patch) | |
| tree | bda12b461433aedf0a1574c41d3d6369d12e6b7a /media | |
| parent | d07094a16d4a65ffe1b7c702797c9b9b7aa65a4b (diff) | |
| parent | 3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a (diff) | |
| download | frameworks_base-965f22ba325ea488034174bf76194470a6f0ee52.zip frameworks_base-965f22ba325ea488034174bf76194470a6f0ee52.tar.gz frameworks_base-965f22ba325ea488034174bf76194470a6f0ee52.tar.bz2 | |
am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb
* commit '3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
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 7312d75..cbc7529 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1450,7 +1450,7 @@ public class AudioService extends IAudioService.Stub { if (AudioSystem.getForceUse(AudioSystem.FOR_COMMUNICATION) == AudioSystem.FORCE_BT_SCO) { // Log.v(TAG, "getActiveStreamType: Forcing STREAM_BLUETOOTH_SCO..."); return AudioSystem.STREAM_BLUETOOTH_SCO; - } else if (isOffhook || AudioSystem.isStreamActive(AudioSystem.STREAM_VOICE_CALL)) { + } else if (isOffhook || getMode() == AudioManager.MODE_IN_COMMUNICATION) { // Log.v(TAG, "getActiveStreamType: Forcing STREAM_VOICE_CALL..."); return AudioSystem.STREAM_VOICE_CALL; } else if (AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC)) { |