From b0e0f5f44ad8d03bb1f41b0ad68d371d8ccb2b4c Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 28 Feb 2022 10:53:36 -0800
Subject: [PATCH] Adding better diags when SysUI crashes during Launcher test

Test: presubmit; sys ui tests where this rule is already used
Bug: 187761685
Change-Id: Ib4491e5c7ebbea0bb3b17fc8c4b3a6c59a3bdb2a
---
 .../tests/src/com/android/quickstep/FallbackRecentsTest.java  | 4 +++-
 .../src/com/android/launcher3/ui/AbstractLauncherUiTest.java  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 4529217a21..9a39b34ea7 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -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(
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 79a4673b04..5abdcd3508 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -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());