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

Commit cd5d3d0c authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing LauncherActivityRule as it can be flaky based on when the rule... 

Merge "Removing LauncherActivityRule as it can be flaky based on when the rule was initialized" into udc-qpr-dev
parents f351e515 f6b79f7c

src/com/android/launcher3/Launcher.java

+0 −16
Original line number Diff line number Diff line
@@ -424,7 +424,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
    @Override

    @TargetApi(Build.VERSION_CODES.S)

    protected void onCreate(Bundle savedInstanceState) {

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onCreate 1");

        mStartupLatencyLogger = createStartupLatencyLogger(

                sIsNewProcess

                        ? LockedUserState.get(this).isUserUnlockedAtLauncherStartup()
@@ -583,7 +582,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
        }

        setTitle(R.string.home_screen);

        mStartupLatencyLogger.logEnd(LAUNCHER_LATENCY_STARTUP_ACTIVITY_ON_CREATE);

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onCreate 2");

    }



    /**
@@ -1058,7 +1056,6 @@ public class Launcher extends StatefulActivity<LauncherState> 


    @Override

    protected void onStop() {

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onStop 1");

        super.onStop();

        if (mDeferOverlayCallbacks) {

            checkIfOverlayStillDeferred();
@@ -1070,12 +1067,10 @@ public class Launcher extends StatefulActivity<LauncherState> 
        mAppWidgetHolder.setActivityStarted(false);

        NotificationListener.removeNotificationsChangedListener(getPopupDataProvider());

        FloatingIconView.resetIconLoadResult();

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onStop 2");

    }



    @Override

    protected void onStart() {

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onStart 1");

        TraceHelper.INSTANCE.beginSection(ON_START_EVT);

        super.onStart();

        if (!mDeferOverlayCallbacks) {
@@ -1084,7 +1079,6 @@ public class Launcher extends StatefulActivity<LauncherState> 


        mAppWidgetHolder.setActivityStarted(true);

        TraceHelper.INSTANCE.endSection();

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onStart 2");

    }



    @Override
@@ -1255,7 +1249,6 @@ public class Launcher extends StatefulActivity<LauncherState> 


    @Override

    protected void onResume() {

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onResume 1");

        TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT);

        super.onResume();
@@ -1267,12 +1260,10 @@ public class Launcher extends StatefulActivity<LauncherState> 


        DragView.removeAllViews(this);

        TraceHelper.INSTANCE.endSection();

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onResume 2");

    }



    @Override

    protected void onPause() {

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onPause 1");

        // Ensure that items added to Launcher are queued until Launcher returns

        ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_ACTIVITY_PAUSED);
@@ -1285,7 +1276,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
            mOverlayManager.onActivityPaused(this);

        }

        mAppWidgetHolder.setActivityResumed(false);

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onPause 2");

    }



    /**
@@ -1759,8 +1749,6 @@ public class Launcher extends StatefulActivity<LauncherState> 


    @Override

    protected void onSaveInstanceState(Bundle outState) {

        TestProtocol.testLogD(

                TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onSaveInstanceState 1");

        outState.putIntArray(RUNTIME_STATE_CURRENT_SCREEN_IDS,

                mWorkspace.getCurrentPageScreenIds().getArray().toArray());

        outState.putInt(RUNTIME_STATE, mStateManager.getState().ordinal);
@@ -1792,13 +1780,10 @@ public class Launcher extends StatefulActivity<LauncherState> 


        super.onSaveInstanceState(outState);

        mOverlayManager.onActivitySaveInstanceState(this, outState);

        TestProtocol.testLogD(

                TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onSaveInstanceState 2");

    }



    @Override

    public void onDestroy() {

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onDestroy 1");

        super.onDestroy();

        ACTIVITY_TRACKER.onActivityDestroyed(this);
@@ -1821,7 +1806,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
        LauncherAppState.getIDP(this).removeOnChangeListener(this);



        mOverlayManager.onActivityDestroyed(this);

        TestProtocol.testLogD(TestProtocol.ACTIVITY_LIFECYCLE_RULE, "Launcher.onDestroy 2");

    }



    public LauncherAccessibilityDelegate getAccessibilityDelegate() {

tests/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -50,12 +50,10 @@ filegroup { 
      "src/com/android/launcher3/util/Wait.java",

      "src/com/android/launcher3/util/WidgetUtils.java",

      "src/com/android/launcher3/util/rule/FailureWatcher.java",

      "src/com/android/launcher3/util/rule/LauncherActivityRule.java",

      "src/com/android/launcher3/util/rule/ViewCaptureRule.kt",

      "src/com/android/launcher3/util/rule/SamplerRule.java",

      "src/com/android/launcher3/util/rule/ScreenRecordRule.java",

      "src/com/android/launcher3/util/rule/ShellCommandRule.java",

      "src/com/android/launcher3/util/rule/SimpleActivityRule.java",

      "src/com/android/launcher3/util/rule/TestStabilityRule.java",

      "src/com/android/launcher3/util/rule/TISBindRule.java",

      "src/com/android/launcher3/util/viewcapture_analysis/*.java",

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

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public final class TestProtocol { 
    public static final String TWO_TASKBAR_LONG_CLICKS = "b/262282528";

    public static final String FLAKY_ACTIVITY_COUNT = "b/260260325";

    public static final String ICON_MISSING = "b/282963545";

    public static final String ACTIVITY_LIFECYCLE_RULE = "b/289161193";



    public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";

    public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display";

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

+3 −6
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import com.android.launcher3.util.SimpleBroadcastReceiver; 
import com.android.launcher3.util.TestUtil;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.FailureWatcher;

import com.android.launcher3.util.rule.LauncherActivityRule;

import com.android.launcher3.util.rule.SamplerRule;

import com.android.launcher3.util.rule.ScreenRecordRule;

import com.android.launcher3.util.rule.ShellCommandRule;
@@ -182,8 +181,6 @@ public abstract class AbstractLauncherUiTest { 
        mLauncher.setOnLauncherCrashed(() -> mLauncherPid = 0);

    }



    protected final LauncherActivityRule mActivityMonitor = new LauncherActivityRule();



    @Rule

    public ShellCommandRule mDisableHeadsUpNotification =

            ShellCommandRule.disableHeadsUpNotification();
@@ -204,7 +201,8 @@ public abstract class AbstractLauncherUiTest { 
    }



    protected TestRule getRulesInsideActivityMonitor() {

        final ViewCaptureRule viewCaptureRule = new ViewCaptureRule(mActivityMonitor::getActivity);

        final ViewCaptureRule viewCaptureRule = new ViewCaptureRule(

                Launcher.ACTIVITY_TRACKER::getCreatedActivity);

        final RuleChain inner = RuleChain

                .outerRule(new PortraitLandscapeRunner(this))

                .around(new FailureWatcher(mLauncher, viewCaptureRule::getViewCaptureData))
@@ -219,7 +217,6 @@ public abstract class AbstractLauncherUiTest { 
    public TestRule mOrderSensitiveRules = RuleChain

            .outerRule(new SamplerRule())

            .around(new TestStabilityRule())

            .around(mActivityMonitor)

            .around(getRulesInsideActivityMonitor());



    public UiDevice getDevice() {
@@ -322,7 +319,7 @@ public abstract class AbstractLauncherUiTest { 


    protected <T> T getFromLauncher(Function<Launcher, T> f) {

        if (!TestHelpers.isInLauncherProcess()) return null;

        return getOnUiThread(() -> f.apply(mActivityMonitor.getActivity()));

        return getOnUiThread(() -> f.apply(Launcher.ACTIVITY_TRACKER.getCreatedActivity()));

    }



    protected void executeOnLauncher(Consumer<Launcher> f) {

tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java

+5 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.View; 
import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.Launcher;

import com.android.launcher3.celllayout.FavoriteItemsTransaction;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.LauncherAppWidgetInfo;
@@ -124,7 +125,10 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { 


        @Override

        public boolean isTrue() throws Throwable {

            return mMainThreadExecutor.submit(mActivityMonitor.itemExists(this)).get();

            return mMainThreadExecutor.submit(() -> {

                Launcher l = Launcher.ACTIVITY_TRACKER.getCreatedActivity();

                return l != null && l.getWorkspace().getFirstMatch(this) != null;

            }).get();

        }



        @Override