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

Commit 315dbcca authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am ada1f638: Merge "Reset priority on unbond" into jb-mr1-dev 

* commit 'ada1f638':
  Reset priority on unbond
parents fb442580 ada1f638

core/java/android/bluetooth/BluetoothA2dp.java

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            && isValidDevice(device)) {

            if (priority != BluetoothProfile.PRIORITY_OFF &&

                priority != BluetoothProfile.PRIORITY_ON &&

                priority != BluetoothProfile.PRIORITY_UNDEFINED &&

                priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {

              return false;

            }

core/java/android/bluetooth/BluetoothHeadset.java

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
            isValidDevice(device)) {

            if (priority != BluetoothProfile.PRIORITY_OFF &&

                priority != BluetoothProfile.PRIORITY_ON &&

                priority != BluetoothProfile.PRIORITY_UNDEFINED &&

                priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {

              return false;

            }