Merge "Investigator: adding "Screen is empty" as another sign of crashed sysui" into ub-launcher3-master
diff --git a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
index d6dfdd9..6445501 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureInvestigator.java
@@ -55,7 +55,7 @@
private static final ExceptionMatch[] EXCEPTION_MATCHES = {
new ExceptionMatch(
"java.lang.AssertionError: http://go/tapl : Tests are broken by a "
- + "non-Launcher system error: Phone is locked",
+ + "non-Launcher system error: (Phone is locked|Screen is empty)",
new LogcatMatch[]{
new LogcatMatch(
"BroadcastQueue: Can't deliver broadcast to com.android"
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 4089897..83e1b38 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -341,7 +341,8 @@
public void checkForAnomaly() {
final String anomalyMessage = getAnomalyMessage();
if (anomalyMessage != null) {
- String message = "Tests are broken by a non-Launcher system error: " + anomalyMessage;
+ String message = "http://go/tapl : Tests are broken by a non-Launcher system error: "
+ + anomalyMessage;
log("Hierarchy dump for: " + message);
dumpViewHierarchy();