Merge "Ignore scheduled onDeviceGone call on simulated device if it is already no longer present."

2022-10-14 23:07:27 +00:00
parent 4b75f783e8 bfbf0e4b3b
commit b6e7ac6ea1
1 changed files with 3 additions and 1 deletions
--- a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java
+++ b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java
@@ -363,7 +363,9 @@ public class CompanionDevicePresenceMonitor implements AssociationStore.OnChange
        @Override
        public void handleMessage(@NonNull Message msg) {
            final int associationId = msg.what;
-            onDeviceGone(mSimulated, associationId, /* sourceLoggingTag */ "simulated");
+            if (mSimulated.contains(associationId)) {
+                onDeviceGone(mSimulated, associationId, /* sourceLoggingTag */ "simulated");
+            }
        }
    }
 }