commit 1c40f9218d815e4e67482fb8913fce6850e4fb1c
author gitbuildkicker <android-build@google.com> Sun Oct 23 00:08:08 2016 -0700
committer gitbuildkicker <android-build@google.com> Sun Oct 23 00:08:08 2016 -0700
tree d84fa253b0bd6e98193d79adecb70f82fcb0b293
parent c4b1ccb46884a0e23e5411f2bbb2da72fcb267ca
parent 907e0140684a73ed113a9e0c7b4a33827e8d0e36

merge in nyc-mr1-release history after reset to nyc-mr1-dev

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

diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java
index 7d3d319..bb723a7 100644
--- a/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -34,7 +34,7 @@
 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 @@
             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);
                 }
             }