diff options
| author | Raphael Kim <raphk@google.com> | 2023-01-07 19:57:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-07 19:57:24 +0000 |
| commit | ba739bc09f747ce3b4973ada98fc6e225c3c033f (patch) | |
| tree | 193523d3c0c3c6a5a32aa81c2b616579e46c45ab | |
| parent | 846ed06579c9e7d20947c659d126cf6094b7ac49 (diff) | |
| parent | 30433c97d02ec16b1a07a071a4965d678346282e (diff) | |
| download | base-ba739bc09f747ce3b4973ada98fc6e225c3c033f.tar.gz | |
Merge "Remove simulated device from "present" list when disassociated." into tm-dev am: 7dafec61d9 am: 30433c97d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20860700
Change-Id: Ie9eb571cd38151b37988669b8484835ac9a0643a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 a1e734dead77..b3fad8c41328 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 @@ public class CompanionDevicePresenceMonitor implements AssociationStore.OnChange 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 |