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

Commit dfca0970 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before... 

[automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f63 am: 32fb5377 am: 5039e3df

Change-Id: I804a1fec3ada0a394245d5edf0ace4597cc73db6
parents c5101712 5039e3df

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