| commit | 30433c97d02ec16b1a07a071a4965d678346282e | [log] [tgz] |
|---|---|---|
| author | Raphael Kim <raphk@google.com> | Sat Jan 07 19:25:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 07 19:25:33 2023 +0000 |
| tree | 97b87e9dffd6a5d5a07690cc2c619c5de2f57316 | |
| parent | bfc6364c74c49fdd2dd1512b9f49e0cc77fd605c [diff] | |
| parent | 7dafec61d94de1766a89a068908ac76a728b6c4c [diff] |
Merge "Remove simulated device from "present" list when disassociated." into tm-dev am: 7dafec61d9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20860700 Change-Id: I9ac823b5120759a44bbc8e84663d76694698ffb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java index a1e734d..b3fad8c 100644 --- a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java +++ b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java
@@ -281,6 +281,7 @@ mConnectedBtDevices.remove(id); mNearbyBleDevices.remove(id); mReportedSelfManagedDevices.remove(id); + mSimulated.remove(id); // Do NOT call mCallback.onDeviceDisappeared()! // CompanionDeviceManagerService will know that the association is removed, and will do