Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f352143e authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Synchronize the removal of the addresses" into main am: faf2488f am: 08f9a88e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2858505



Change-Id: I8434cb5df3e7cfbcf36a3a1f5ec7c83358fea40a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c0b7e46 08f9a88e

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

+7 −5
Original line number Diff line number Diff line
@@ -1154,6 +1154,7 @@ public class RemoteDevices { 
                        Utils.getTempAllowlistBroadcastOptions());

            } else if (device.getBondState() == BluetoothDevice.BOND_NONE) {

                String key = Utils.getAddressStringFromByte(address);

                synchronized (mDevices) {

                    mDevices.remove(key);

                    mDeviceQueue.remove(key); // Remove from LRU cache
@@ -1161,6 +1162,7 @@ public class RemoteDevices { 
                    mDualDevicesMap.values().remove(key);

                    mDualDevicesMap.remove(key);

                }

            }

            if (state == BluetoothAdapter.STATE_ON || state == BluetoothAdapter.STATE_TURNING_OFF) {

                mAdapterService.notifyAclDisconnected(device, transportLinkType);

                intent = new Intent(BluetoothDevice.ACTION_ACL_DISCONNECTED);