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

Commit 7fb9e673 authored by Myles Watson's avatar Myles Watson
Browse files

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

This reverts commit 9c0ec84c.

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

Change-Id: I88f1c7d5a13ddd7dac7955d778ce709cf94b2fce
Merged-In: Ia20df8fd920e86661beb5249e72464c8e9777815
parent 9c0ec84c

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

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