diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-10-22 02:15:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-22 02:15:26 +0000 |
| commit | 283c7ead04930b5d54837ba55835aa8c07b9b966 (patch) | |
| tree | 42ca772333ee370ba7fdefddeb72ff5e204c1702 | |
| parent | 37b54633cc402f8ea65b8ee632dbc994d9722a4d (diff) | |
| parent | c4b1ccb46884a0e23e5411f2bbb2da72fcb267ca (diff) | |
| download | android_packages_apps_Bluetooth-283c7ead04930b5d54837ba55835aa8c07b9b966.tar.gz android_packages_apps_Bluetooth-283c7ead04930b5d54837ba55835aa8c07b9b966.tar.bz2 android_packages_apps_Bluetooth-283c7ead04930b5d54837ba55835aa8c07b9b966.zip | |
Prevent bonded device from being removed from the property map
am: c4b1ccb468
Change-Id: I9d41d8834a5524c98bcb1e1d1ff2e67deb0a9501
| -rw-r--r-- | src/com/android/bluetooth/btservice/RemoteDevices.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java index 7d3d31902..bb723a797 100644 --- a/src/com/android/bluetooth/btservice/RemoteDevices.java +++ b/src/com/android/bluetooth/btservice/RemoteDevices.java @@ -34,7 +34,7 @@ import java.util.LinkedList; import java.util.Queue; final class RemoteDevices { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "BluetoothRemoteDevices"; // Maximum number of device properties to remember @@ -96,10 +96,15 @@ final class RemoteDevices { prop.mAddress = address; String key = Utils.getAddressStringFromByte(address); DeviceProperties pv = mDevices.put(key, prop); + if (pv == null) { mDeviceQueue.offer(key); if (mDeviceQueue.size() > MAX_DEVICE_QUEUE_SIZE) { String deleteKey = mDeviceQueue.poll(); + for (BluetoothDevice device : mAdapterService.getBondedDevices()) { + if (device.getAddress().equals(deleteKey)) return prop; + } + debugLog("Removing device " + deleteKey + " from property map"); mDevices.remove(deleteKey); } } |