summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-08-27 11:08:55 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2009-08-27 11:08:55 -0700
commit6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7 (patch)
tree2ac84f1d9542a2617e8ab0e91e0d77f714575898
parent4d5b4225e492f3de543efa195204f38d03a6721a (diff)
parent78333dd750c7353e47163407a662ef39a3c6b24a (diff)
Merge change 22870 into eclair
* changes: Set Routing to A2DP only when state is Connected.
-rw-r--r--media/java/android/media/AudioService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index d1b9351196e2..754d5a2d754f 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1381,7 +1381,8 @@ public class AudioService extends IAudioService.Stub {
address);
mConnectedDevices.remove(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP);
} else if (!isConnected &&
- (state == BluetoothA2dp.STATE_CONNECTED || state != BluetoothA2dp.STATE_PLAYING)){
+ (state == BluetoothA2dp.STATE_CONNECTED ||
+ state == BluetoothA2dp.STATE_PLAYING)) {
AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,
AudioSystem.DEVICE_STATE_AVAILABLE,
address);