commit 0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b
author Jaikumar Ganesh <jaikumar@google.com> Wed Jan 06 13:38:27 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 06 13:38:27 2010 -0800
tree f89292aeb8a6bf438419af3e13d68720bcb58f6e
parent cb2d50d0d6e2e37ae02b014999da23ecd32038b8
parent 6309689e6c35e4aff116fe6b3c806bef52975e66

Merge "Fix media option settings for A2DP." into eclair

core/java/android/server/BluetoothA2dpService.java

diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java
index dfec1eb..46145b9 100644
--- a/core/java/android/server/BluetoothA2dpService.java
+++ b/core/java/android/server/BluetoothA2dpService.java
@@ -463,7 +463,8 @@
                 mAudioManager.setParameters("A2dpSuspended=false");
             }
 
-            if (state == BluetoothA2dp.STATE_CONNECTING ||
+            if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&
+                    state == BluetoothA2dp.STATE_CONNECTING ||
                     state == BluetoothA2dp.STATE_CONNECTED) {
                 // We have connected or attempting to connect.
                 // Bump priority