commit 6309689e6c35e4aff116fe6b3c806bef52975e66
author Jaikumar Ganesh <jaikumar@google.com> Wed Jan 06 11:41:41 2010 -0800
committer Jaikumar Ganesh <jaikumar@google.com> Wed Jan 06 11:43:10 2010 -0800
tree a1c4e13a53765a75340572754f3df88efd3c198a
parent 42c98ada113ae5b7c72ecb6d0de721ec1d0d3534

Fix media option settings for A2DP.

Incoming connections move the A2DP state to Connecting
before getting authorized, which messes up the priorities.

Dr No: Eastham
Bug: 2358414

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