drgreen/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
commit 7258ba537d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,16 @@ public class DisplayAreaOrganizerController extends IDisplayAreaOrganizerControl
@Override
public void binderDied() {
synchronized (mGlobalLock) {
mOrganizersByFeatureIds.remove(mFeature).destroy();
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();
}
}
}
}
@ -172,7 +181,7 @@ public class DisplayAreaOrganizerController extends IDisplayAreaOrganizerControl
organizer.asBinder(), uid);
mOrganizersByFeatureIds.entrySet().removeIf((entry) -> {
final boolean matches = entry.getValue().mOrganizer.asBinder()
== organizer.asBinder();
.equals(organizer.asBinder());
if (matches) {
entry.getValue().destroy();
}