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

Commit 21036b35 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469,... 

Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, 7077580, 7077581, 7077582, 7074025, 7077706, 7077707, 7077708, 7077388, 7077583, 7077584, 7077585, 7077726, 7077727, 7077331, 7077332, 7077459, 7077709, 7077710, 7077711, 7077712, 7077460, 7077461, 7077333, 7077334, 7077696] into pi-qpr3-release

Change-Id: I02a23201f2b2bbf5b9ab6aaddfd42189aaa644b1
parents ce38a42c d19e3e48

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+2 −2
Original line number Diff line number Diff line
@@ -371,9 +371,9 @@ final class BondStateMachine extends StateMachine { 


        mAdapterProperties.onBondStateChanged(device, newState);



        if ((devProp.getDeviceType() == BluetoothDevice.DEVICE_TYPE_CLASSIC

        if (devProp != null && ((devProp.getDeviceType() == BluetoothDevice.DEVICE_TYPE_CLASSIC

                || devProp.getDeviceType() == BluetoothDevice.DEVICE_TYPE_DUAL)

                && newState == BluetoothDevice.BOND_BONDED && devProp.getUuids() == null) {

                && newState == BluetoothDevice.BOND_BONDED && devProp.getUuids() == null)) {

            infoLog(device + " is bonded, wait for SDP complete to broadcast bonded intent");

            if (!mPendingBondedDevices.contains(device)) {

                mPendingBondedDevices.add(device);