commit 71117c99b96bc4805a8efbb85375fdfd21e243e2
author Myles Watson <mylesgw@google.com> Fri Mar 15 13:12:50 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 16 06:05:51 2019 +0000
tree 6f6d487fc9b00ff0c2b2af70279f4018cce1ffed
parent a9ec77e39e3b13764363ac3779fe949833c22f91

BondStateMachine: Check for null before calling getDeviceType

Bug: 128572820
Bug: 79703832
Test: Compilation
Change-Id: I711e08b076adb7b4808d04a47cb067cb95606f96
(cherry picked from commit d1dd037de2a827056f1dcdf119072646430c1e51)

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

diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index e89f5e7..81e5aae 100644
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -371,9 +371,9 @@
 
         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);