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

Commit 0a86ed2d authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

Merge "Remove simulated device from "present" list when disassociated." into... 

Merge "Remove simulated device from "present" list when disassociated." into tm-dev am: 7dafec61 am: 30433c97 am: ba739bc0 am: 9ce1a101

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20860700



Change-Id: I752b50a8dfdab368793146dd4e9aed9efe618d65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f245098 9ce1a101

services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -281,6 +281,7 @@ public class CompanionDevicePresenceMonitor implements AssociationStore.OnChange 
        mConnectedBtDevices.remove(id);

        mConnectedBtDevices.remove(id);

        mNearbyBleDevices.remove(id);

        mNearbyBleDevices.remove(id);

        mReportedSelfManagedDevices.remove(id);

        mReportedSelfManagedDevices.remove(id);

        mSimulated.remove(id);





        // Do NOT call mCallback.onDeviceDisappeared()!

        // Do NOT call mCallback.onDeviceDisappeared()!

        // CompanionDeviceManagerService will know that the association is removed, and will do

        // CompanionDeviceManagerService will know that the association is removed, and will do