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

Commit 48d7ccae authored by Myles Watson's avatar Myles Watson
Browse files

Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" 

This reverts commit cebf7b93.

Bug: 79703832

Reason for revert: Pairing regression with dual-mode devices on the parent patch

Change-Id: If0e5d2e374d13f619d3bbe561b781a6dc8b803c8
parent cebf7b93

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

+2 −2
Original line number Diff line number Diff line
@@ -363,9 +363,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);