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

Commit ac82e995 authored by Cliff Wang's avatar Cliff Wang Committed by Android (Google) Code Review
Browse files

Revert "Make sure TAPL waits for Launcher activity to stop each time it stops" 

This reverts commit dd33b64a.

Reason for revert: “DroidMonitor: Potential culprit for Bug b/323619378 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.”.

Bug:323619378
Change-Id: Iadaa80f2cc51f39ae3ab73cdd49a98d05835506e
parent dd33b64a

src/com/android/launcher3/Launcher.java

+0 −10
Original line number Diff line number Diff line
@@ -412,8 +412,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
    private final SettingsCache.OnChangeListener mNaturalScrollingChangedListener =

            enabled -> mIsNaturalScrollingEnabled = enabled;



    private int mActivityStopCount; // Used only by tests



    public static Launcher getLauncher(Context context) {

        return fromContext(context);

    }
@@ -1055,18 +1053,10 @@ public class Launcher extends StatefulActivity<LauncherState> 
        mAppWidgetHolder.setActivityStarted(false);

        NotificationListener.removeNotificationsChangedListener(getPopupDataProvider());

        FloatingIconView.resetIconLoadResult();

        ++mActivityStopCount;

        AccessibilityManagerCompat.sendTestProtocolEventToTest(

                this, LAUNCHER_ACTIVITY_STOPPED_MESSAGE);

    }



    /** Return activity stop count and reset it. Used only by tests. */

    public int getAndResetActivityStopCount() {

        final int activityStopCount = mActivityStopCount;

        mActivityStopCount = 0;

        return activityStopCount;

    }



    @Override

    protected void onStart() {

        TraceHelper.INSTANCE.beginSection(ON_START_EVT);

src/com/android/launcher3/testing/TestInformationHandler.java

+0 −10
Original line number Diff line number Diff line
@@ -208,16 +208,6 @@ public class TestInformationHandler implements ResourceBasedOverride { 
                                .forceAllowRotationForTesting(Boolean.parseBoolean(arg)));

                return response;



            case TestProtocol.REQUEST_GET_AND_RESET_ACTIVITY_STOP_COUNT: {

                final Bundle bundle = getLauncherUIProperty(Bundle::putInt,

                        launcher -> launcher.getAndResetActivityStopCount());

                if (bundle != null) return bundle;



                // If Launcher activity wasn't created, 'it' was stopped 0 times.

                response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, 0);

                return response;

            }



            case TestProtocol.REQUEST_WORKSPACE_CELL_LAYOUT_SIZE:

                return getLauncherUIProperty(Bundle::putIntArray, launcher -> {

                    final Workspace<?> workspace = launcher.getWorkspace();

tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+0 −3
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ public final class TestProtocol { 
    public static final String REQUEST_UNSTASH_BUBBLE_BAR_IF_STASHED =

            "unstash-bubble-bar-if-stashed";



    public static final String REQUEST_GET_AND_RESET_ACTIVITY_STOP_COUNT =

            "get-and-reset-activity-stops";



    /** Logs {@link Log#d(String, String)} if {@link #sDebugTracing} is true. */

    public static void testLogD(String tag, String message) {

        if (!sDebugTracing) {

tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+0 −3
Original line number Diff line number Diff line
@@ -598,9 +598,6 @@ public abstract class AbstractLauncherUiTest { 
        Wait.atMost("Launcher activity didn't stop",

                () -> !launcherInstrumentation.isLauncherActivityStarted(),

                DEFAULT_ACTIVITY_TIMEOUT, launcherInstrumentation);



        // Reset activity stop count.

        launcherInstrumentation.getAndResetActivityStopCount();

    }



    public static ActivityInfo resolveSystemAppInfo(String category) {

tests/multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java

+1 −5
Original line number Diff line number Diff line
@@ -44,15 +44,11 @@ public class TestIsolationRule implements TestRule { 
        return new Statement() {

            @Override

            public void evaluate() throws Throwable {

                // Reset activity stop count.

                mLauncher.getAndResetActivityStopCount();



                base.evaluate();



                // Make sure that Launcher workspace looks correct.



                UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).pressHome();

                AbstractLauncherUiTest.checkDetectedLeaks(mLauncher, mRequireOneActiveActivity);

                mLauncher.assertNoUnexpectedStops();

            }

        };

    }