From af253b5357a3d4cba18b635ebd813e60fecb3b67 Mon Sep 17 00:00:00 2001
From: Raphael Kim <raphk@google.com>
Date: Tue, 3 Jan 2023 09:34:38 -0800
Subject: [PATCH] Remove simulated device from "present" list when
 disassociated.

Bug: 262910767
Test: atest CtsCompanionDeviceManagerCoreTestCases --iterations 10
Change-Id: Ia9a5de47ce0cc1293c1b99d7247bceccf36d5808
---
 .../companion/presence/CompanionDevicePresenceMonitor.java       | 1 +
 1 file changed, 1 insertion(+)

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 a1e734dead777..b3fad8c413289 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