PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Rename closeEvents to reduce confusion" into ub-launcher3-rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-18 21:21:14 +00:00
committed by Android (Google) Code Review
parent d5315f8c29 7e4d19f842
commit 7cdb4cfecc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+5 -4
View File
@@ -362,7 +362,7 @@ public final class LauncherInstrumentation {
public void checkForAnomaly() {
final String systemAnomalyMessage = getSystemAnomalyMessage();
if (systemAnomalyMessage != null) {
Assert.fail(formatSystemHealthMessage(closeEvents(
Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
"http://go/tapl : Tests are broken by a non-Launcher system error: "
+ systemAnomalyMessage, false)));
}
@@ -424,7 +424,7 @@ public final class LauncherInstrumentation {
return message;
}
private String closeEvents(String message, boolean checkEvents) {
private String formatErrorWithEvents(String message, boolean checkEvents) {
if (sCheckingEvents) {
sCheckingEvents = false;
if (checkEvents) {
@@ -454,7 +454,7 @@ public final class LauncherInstrumentation {
private void fail(String message) {
checkForAnomaly();
Assert.fail(formatSystemHealthMessage(closeEvents(
Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
"http://go/tapl : " + getContextDescription() + message
+ " (visible state: " + getVisibleStateMessage() + ")", true)));
}
@@ -1309,7 +1309,8 @@ public final class LauncherInstrumentation {
if (mOnLauncherCrashed != null) mOnLauncherCrashed.run();
checkForAnomaly();
Assert.fail(
formatSystemHealthMessage(closeEvents("Launcher crashed", false)));
formatSystemHealthMessage(
formatErrorWithEvents("Launcher crashed", false)));
}
if (sCheckingEvents) {