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

Commit 7691138d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when calculateTransitionInfo"

parents 4ba510c6 9e93fa7a

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

+4 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,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 */