Merge "Ignore scheduled onDeviceGone call on simulated device if it is already no longer present." into tm-dev am: 534925c288 am: 60b29a5682

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

Change-Id: Icbfd903d7c1799b00f68dab06f15ffbd39f695dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liana Kazanova
2022-12-02 22:27:44 +00:00
committed by Automerger Merge Worker

View File

@@ -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");
}
}
}
}