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

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

Merge "WM: Don't skip on parent changed when creating TestAppWindowToken"

parents 8c50dc11 aab3d3d7

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

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ class WindowTestsBase { 
    WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int

            windowingMode, int activityType) {

        return createTestAppWindowToken(dc, windowingMode, activityType,

                true /*skipOnParentChanged */);

                false /*skipOnParentChanged */);

    }



    WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int

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

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class ZOrderingTests extends WindowTestsBase { 
        public SurfaceControl.Transaction setLayer(SurfaceControl sc, int layer) {

            mRelativeLayersForControl.remove(sc);

            mLayersForControl.put(sc, layer);

            return super.setLayer(sc, layer);

            return this;

        }



        @Override
@@ -83,7 +83,7 @@ public class ZOrderingTests extends WindowTestsBase { 
                int layer) {

            mRelativeLayersForControl.put(sc, relativeTo);

            mLayersForControl.put(sc, layer);

            return super.setRelativeLayer(sc, relativeTo, layer);

            return this;

        }



        private int getLayer(SurfaceControl sc) {