Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix StageCoordinator unexpected onDisplayAreaVanished"

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-12 02:45:13 +00:00
committed by Gerrit Code Review
parent 17da00b993 011e10f275
commit 7258ba537d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/DisplayAreaOrganizerController.java
View File

@@ -65,10 +65,19 @@ public class DisplayAreaOrganizerController extends IDisplayAreaOrganizerControl
@Override @Override
public void binderDied() { public void binderDied() {
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
IDisplayAreaOrganizer featureOrganizer = getOrganizerByFeature(mFeature);
if (featureOrganizer != null) {
IBinder organizerBinder = featureOrganizer.asBinder();
if (!organizerBinder.equals(mOrganizer.asBinder()) &&
organizerBinder.isBinderAlive()) {
Slog.d(TAG, "Dead organizer replaced for feature=" + mFeature);
return;
}
mOrganizersByFeatureIds.remove(mFeature).destroy(); mOrganizersByFeatureIds.remove(mFeature).destroy();
} }
} }
} }
}
private class DisplayAreaOrganizerState { private class DisplayAreaOrganizerState {
private final IDisplayAreaOrganizer mOrganizer; private final IDisplayAreaOrganizer mOrganizer;
@@ -172,7 +181,7 @@ public class DisplayAreaOrganizerController extends IDisplayAreaOrganizerControl
organizer.asBinder(), uid); organizer.asBinder(), uid);
mOrganizersByFeatureIds.entrySet().removeIf((entry) -> { mOrganizersByFeatureIds.entrySet().removeIf((entry) -> {
final boolean matches = entry.getValue().mOrganizer.asBinder() final boolean matches = entry.getValue().mOrganizer.asBinder()
== organizer.asBinder(); .equals(organizer.asBinder());
if (matches) { if (matches) {
entry.getValue().destroy(); entry.getValue().destroy();
} }