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

Commit 9e93fa7a authored by Chris Li's avatar Chris Li
Browse files

Fix NPE when calculateTransitionInfo 

mParent can only be organized window.

Bug: 194112093
Test: cts/framework/gce-presubmit-wm-cloud-tf-1-shelltransit
Change-Id: Iabe7e7998326defb7c58d31c943f2fc2531a82fe
parent 077c836e

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

+4 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,10 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
            for (WindowContainer<?> p = wc.getParent(); p != null; p = p.getParent()) {

                final ChangeInfo parentChange = changes.get(p);

                if (parentChange == null || !parentChange.hasChanged(p)) break;

                if (p.mRemoteToken == null) {

                    // Intermediate parents must be those that has window to be managed by Shell.

                    continue;

                }

                if (parentChange.mParent != null && !skipIntermediateReports) {

                    changes.get(wc).mParent = p;

                    // The chain above the parent was processed.

services/tests/wmtests/src/com/android/server/wm/TransitionTests.java

+3 −0
Original line number Diff line number Diff line
@@ -739,6 +739,9 @@ public class TransitionTests extends WindowTestsBase { 
            }

            from = from.getParent();

        }

        if (end.asDisplayArea() != null) {

            end.asDisplayArea().mOrganizer = organizer;

        }

    }



    /** Fill the change map with all the parents of top. Change maps are usually fully populated */