summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/bluetooth/btservice/BondStateMachine.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index 81e5aae5a..e89f5e7e1 100644
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -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);