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

Commit 14232423 authored by Myles Watson's avatar Myles Watson Committed by android-build-team Robot
Browse files

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

This reverts commit 61ee982b.
Bug: 79703832

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

Change-Id: Ia20df8fd920e86661beb5249e72464c8e9777815
(cherry picked from commit 2c3e3f50)
parent 21036b35

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