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

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

Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858,... 

Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, 7069859, 7070136, 7070137, 7070138, 7071045, 7071046, 7071047, 7071048, 7070081, 7070863, 7070082, 7069862, 7069863, 7069864, 7071085, 7070118] into pi-qpr3-b-release

Change-Id: Ib215001fe567878ab78f4beb13545c4a7c3cfa48
parents 7db171b8 0df8cf0d

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