diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-03 10:27:37 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-03 10:27:37 +0000 |
| commit | b457a2901c98da60f0807af317c1c65939a5b086 (patch) | |
| tree | 70b9d1614b728720dafb8370b33821e332b48241 | |
| parent | 6521057e4e142068e95f5378220f521626c5dff2 (diff) | |
| parent | 70e9215268191bdb1ede3fb2c7b37c15180bb4e2 (diff) | |
| download | android_packages_apps_Bluetooth-b457a2901c98da60f0807af317c1c65939a5b086.tar.gz android_packages_apps_Bluetooth-b457a2901c98da60f0807af317c1c65939a5b086.tar.bz2 android_packages_apps_Bluetooth-b457a2901c98da60f0807af317c1c65939a5b086.zip | |
Merge cherrypicks of [7316389, 7315812, 7315813, 7316457, 7316055, 7315736, 7316390, 7316458, 7316459, 7316460, 7316561, 7316562, 7316563, 7316564, 7316565, 7316566, 7316567, 7316391, 7315814, 7316548] into pi-qpr3-b-release
Change-Id: I033e0d33a512dc819951913d1a56c07178bf5e1c
| -rw-r--r-- | src/com/android/bluetooth/btservice/BondStateMachine.java | 4 |
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); |