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

Commit e8f7dd5a authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Further tightening leak detector checks" into main

parents bd4776b0 c116cee7

quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java

+1 −1
Original line number Diff line number Diff line
@@ -95,6 +95,6 @@ public class AbstractTaplTestsTaskbar extends AbstractQuickStepTest { 
        launcher.enableTransientTaskbar(expectTransientTaskbar);

        launcher.recreateTaskbar();

        launcher.checkForAnomaly(true, true);

        AbstractLauncherUiTest.checkDetectedLeaks(launcher);

        AbstractLauncherUiTest.checkDetectedLeaks(launcher, true);

    }

}

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public class FallbackRecentsTest { 
    public void tearDown() {

        try {

            // Limits UI tests affecting tests running after them.

            AbstractQuickStepTest.checkDetectedLeaks(mLauncher);

            AbstractQuickStepTest.checkDetectedLeaks(mLauncher, true);

        } finally {

            mLauncher.onTestFinish();

        }

quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class NavigationModeSwitchRule implements TestRule { 
                        + launcher.getNavigationModeMismatchError(false),

                () -> launcher.getNavigationModeMismatchError(false) == null,

                WAIT_TIME_MS, launcher);

        AbstractLauncherUiTest.checkDetectedLeaks(launcher);

        AbstractLauncherUiTest.checkDetectedLeaks(launcher, true);

        return true;

    }

quickstep/tests/src/com/android/quickstep/TaskbarModeSwitchRule.java

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class TaskbarModeSwitchRule implements TestRule { 
        assertTrue(launcher, "Couldn't set taskbar=" + expectTransientTaskbar,

                isTaskbarTransientMode(context) == expectTransientTaskbar, description);



        AbstractLauncherUiTest.checkDetectedLeaks(launcher);

        AbstractLauncherUiTest.checkDetectedLeaks(launcher, true);

    }



    private static void assertTrue(LauncherInstrumentation launcher, String message,

tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class PortraitLandscapeRunner implements TestRule { 
            private void evaluateInPortrait() throws Throwable {

                mTest.mDevice.setOrientationNatural();

                mTest.mLauncher.setExpectedRotation(Surface.ROTATION_0);

                AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher);

                AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher, true);

                base.evaluate();

                mTest.getDevice().pressHome();

            }
@@ -82,7 +82,7 @@ public class PortraitLandscapeRunner implements TestRule { 
            private void evaluateInLandscape() throws Throwable {

                mTest.mDevice.setOrientationLeft();

                mTest.mLauncher.setExpectedRotation(Surface.ROTATION_90);

                AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher);

                AbstractLauncherUiTest.checkDetectedLeaks(mTest.mLauncher, true);

                base.evaluate();

                mTest.getDevice().pressHome();

            }