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

Commit aab3d3d7 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

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

This was causing a few tests to break since a surface control was not being created and the tests
expected a surface control.
- ZOrderingTests
- AppChangeTransitionTests
- AppWindowTokenAnimationTests

Reverting the change did not cause any new test failures and fixed ZOrderingTests. If the change does not
cause any issues, will follow up with a cl to clean up the special case for TestAppWindowTokens.

Bug: 127948929
Test: atest WmTests
Change-Id: I2f374283472f1020a2792ca83de3f0fadc92009f
parent f1e41898

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) {