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

Commit ffc55e48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding better diags when SysUI crashes during Launcher test" into tm-dev am: 60a15f5c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17033582

Change-Id: I0babb2408b75dfe081bb1c7ce9a20baa535b6b68
parents d1a3171f 60a15f5c

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

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.os.RemoteException;

import android.platform.test.rule.CrashDetector;



import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;
@@ -105,7 +106,8 @@ public class FallbackRecentsTest { 
        }



        mOrderSensitiveRules = RuleChain

                .outerRule(new NavigationModeSwitchRule(mLauncher))

                .outerRule(new CrashDetector("com.android.systemui"))

                .around(new NavigationModeSwitchRule(mLauncher))

                .around(new FailureWatcher(mDevice, mLauncher));



        mOtherLauncherActivity = context.getPackageManager().queryIntentActivities(

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

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.rule.CrashDetector;

import android.system.OsConstants;

import android.util.Log;
@@ -225,6 +226,7 @@ public abstract class AbstractLauncherUiTest { 
    @Rule

    public TestRule mOrderSensitiveRules = RuleChain

            .outerRule(new TestStabilityRule())

            .around(new CrashDetector("com.android.systemui"))

            .around(mActivityMonitor)

            .around(getRulesInsideActivityMonitor());