Merge "Ensure device properties are non-null before checking if the d…

…evice is bonding in RemoteDevices#fetchUuids" into sc-dev

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

@@ -745,8 +745,9 @@ void fetchUuids(BluetoothDevice device) {
         }
 
         // If no UUIDs are cached and the device is bonding, wait for SDP after the device is bonded
-        boolean isBonding = getDeviceProperties(device).isBonding();
-        if (isBonding && getDeviceProperties(device).getUuids() == null) {
+        DeviceProperties deviceProperties = getDeviceProperties(device);
+        if (deviceProperties != null && deviceProperties.isBonding()
+                && getDeviceProperties(device).getUuids() == null) {
             return;
         }
 
@@ -757,7 +758,7 @@ void fetchUuids(BluetoothDevice device) {
         mHandler.sendMessageDelayed(message, UUID_INTENT_DELAY);
 
         // Uses cached UUIDs if we are bonding. If not, we fetch the UUIDs with SDP.
-        if (!isBonding) {
+        if (deviceProperties == null || !deviceProperties.isBonding()) {
             sAdapterService.getRemoteServicesNative(Utils.getBytesFromAddress(device.getAddress()));
         }
     }