Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011e10f2 authored by ot903107's avatar ot903107 Committed by Chuanghua Zhao
Browse files

Fix StageCoordinator unexpected onDisplayAreaVanished 

Seems already call Binder unlinkToDeath while registerOrganizer
but still received binderDied in DAOC, dead organizer already
been replaced by newer organizer with same featureId and will
remove the newer organizer.

Add a judge to make sure same organizer obecjt and old organizer
binder isn't alive while DAOC received binderDied.

Bug: 208552581
Test: run autotest pass

Change-Id: I555d2fdedb7be7b7d0e5b10fbc617a9cce66c4b5
parent 6434804c

services/core/java/com/android/server/wm/DisplayAreaOrganizerController.java

+11 −2
Original line number Diff line number Diff line
@@ -65,10 +65,19 @@ public class DisplayAreaOrganizerController extends IDisplayAreaOrganizerControl 
        @Override

        public void binderDied() {

            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();

                }

            }

        }

    }



    private class DisplayAreaOrganizerState {

        private final IDisplayAreaOrganizer mOrganizer;
@@ -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();

                    }