Pairing: Don't delete bonding devices from dev prop map

When LE scan in backgound , there is chance that APP
dev prop map reaches its max size and hence old entry will be
removed. If bonding device entry remeoved , then user accepted pairing
pop up can' be forwarded to stack as dev entry removed

Hence Don't delete bonding devices from dev prop map
when max entries reached

Change-Id: I6c7faae3c5c5f5fe620c802fa8734cd04dacb016
CRs-Fixed: 3172117

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java
index 471d64945..b82f492f1 100644
--- a/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -271,6 +271,13 @@ final class RemoteDevices {
                             return prop;
                         }
                     }
+
+                    BluetoothDevice newdevice = getDevice(Utils.addressToBytes(deleteKey));
+                    DeviceProperties deviceProperties = getDeviceProperties(newdevice);
+                    if (deviceProperties != null && deviceProperties.isBonding()) {
+                        debugLog("Bonding device " + deleteKey + " Don't remove from property map");
+                        return prop;
+                    }
                     debugLog("Removing device " + deleteKey + " from property map");
                     mDevices.remove(deleteKey);
                 }