Rename closeEvents to reduce confusion
Change-Id: I73f083c568846ec8f96b4b403afdaf10d75a106e
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index b333100..9749567 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -362,7 +362,7 @@
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 @@
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 @@
private void fail(String message) {
checkForAnomaly();
- Assert.fail(formatSystemHealthMessage(closeEvents(
+ Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
"http://go/tapl : " + getContextDescription() + message
+ " (visible state: " + getVisibleStateMessage() + ")", true)));
}
@@ -1315,7 +1315,8 @@
if (mOnLauncherCrashed != null) mOnLauncherCrashed.run();
checkForAnomaly();
Assert.fail(
- formatSystemHealthMessage(closeEvents("Launcher crashed", false)));
+ formatSystemHealthMessage(
+ formatErrorWithEvents("Launcher crashed", false)));
}
if (sCheckingEvents) {