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

Commit 1c5cb49b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986,... 

Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, 7068987, 7068800, 7068004] into pi-qpr3-b-release

Change-Id: Ice604b79243cf87930a00106fb36e0825e2a20a7
parents 9786b255 0adad4d9

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);