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

Commit 9924cd26 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7316389, 7315812, 7315813, 7316457, 7316055, 7315736,... 

Merge cherrypicks of [7316389, 7315812, 7315813, 7316457, 7316055, 7315736, 7316390, 7316458, 7316459, 7316460, 7316561, 7316562, 7316563, 7316564, 7316565, 7316566, 7316567, 7316391, 7315814, 7316548] into pi-qpr3-b-release

Change-Id: I033e0d33a512dc819951913d1a56c07178bf5e1c
parents b9e696fb 4841d158

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 != null && ((devProp.getDeviceType() == BluetoothDevice.DEVICE_TYPE_CLASSIC

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