diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-01-11 14:20:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-11 14:20:53 -0800 |
| commit | 495d820c0124a811b9352b93ce4fe88c716f259d (patch) | |
| tree | cc68505b5c43a3cd42be51a76ed92996a939acca /core/java/android/server | |
| parent | 2bb1f87089faa14954c1b5afa92a34ea947f5ff6 (diff) | |
| parent | ccaebfc9428aa7c167caf469f7393e1fb375307e (diff) | |
| download | frameworks_base-495d820c0124a811b9352b93ce4fe88c716f259d.zip frameworks_base-495d820c0124a811b9352b93ce4fe88c716f259d.tar.gz frameworks_base-495d820c0124a811b9352b93ce4fe88c716f259d.tar.bz2 | |
am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp
* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
Don't set priority in Bonding state.
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index 8859339..1742e72 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -100,7 +100,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { setSinkPriority(device, BluetoothA2dp.PRIORITY_ON); } break; - case BluetoothDevice.BOND_BONDING: case BluetoothDevice.BOND_NONE: setSinkPriority(device, BluetoothA2dp.PRIORITY_UNDEFINED); break; @@ -400,7 +399,7 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); return Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.getBluetoothA2dpSinkPriorityKey(device.getAddress()), - BluetoothA2dp.PRIORITY_OFF); + BluetoothA2dp.PRIORITY_UNDEFINED); } public synchronized boolean setSinkPriority(BluetoothDevice device, int priority) { |