Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f3856c4 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 495d820c: am ccaebfc9: Don\'t set priority in Bonding state. This was... 

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 '495d820c'

* commit '495d820c':
  Don't set priority in Bonding state.
parents 6e106ff7 495d820c

core/java/android/server/BluetoothA2dpService.java

+1 −2
Original line number Diff line number Diff line
@@ -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) {