diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-01-11 14:23:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-11 14:23:18 -0800 |
| commit | 1f3856c446a5bb6ab44af86b443ee6591126042a (patch) | |
| tree | 9b3eaed70c0ae0a4e8bc47349ceee83b7bc5ba7f /core/java/android/server | |
| parent | 6e106ff7b419613eca17839f224344fbfc450559 (diff) | |
| parent | 495d820c0124a811b9352b93ce4fe88c716f259d (diff) | |
| download | frameworks_base-1f3856c446a5bb6ab44af86b443ee6591126042a.zip frameworks_base-1f3856c446a5bb6ab44af86b443ee6591126042a.tar.gz frameworks_base-1f3856c446a5bb6ab44af86b443ee6591126042a.tar.bz2 | |
am 495d820c: 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 '495d820c0124a811b9352b93ce4fe88c716f259d'
* commit '495d820c0124a811b9352b93ce4fe88c716f259d':
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 5e234da..22bb43c 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; @@ -407,7 +406,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) { |