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

Commit e44579ee authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "BondStateMachine: Check for null before calling getDeviceType" into... 

Merge "BondStateMachine: Check for null before calling getDeviceType" into oc-mr1-dev am: d324c00a
am: 5a2f3afc

Change-Id: Iaef336f51c37bcbb4e76d9c8c3ae312979d56b9c
parents 73cc204f 5a2f3afc

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

+2 −2
Original line number Diff line number Diff line
@@ -395,9 +395,9 @@ final class BondStateMachine extends StateMachine { 
                mAdapterService.obfuscateAddress(device), classOfDevice);

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