Merge "Add navigation mode diags to the system anomaly detection" into ub-launcher3-rvc-dev
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 9c92a26..08c721a 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -332,26 +332,31 @@
private String getSystemAnomalyMessage() {
try {
- final StringBuilder sb = new StringBuilder();
+ {
+ final StringBuilder sb = new StringBuilder();
- UiObject2 object = mDevice.findObject(By.res("android", "alertTitle"));
- if (object != null) {
- sb.append("TITLE: ").append(object.getText());
- }
+ UiObject2 object = mDevice.findObject(By.res("android", "alertTitle"));
+ if (object != null) {
+ sb.append("TITLE: ").append(object.getText());
+ }
- object = mDevice.findObject(By.res("android", "message"));
- if (object != null) {
- sb.append(" PACKAGE: ").append(object.getApplicationPackage())
- .append(" MESSAGE: ").append(object.getText());
- }
+ object = mDevice.findObject(By.res("android", "message"));
+ if (object != null) {
+ sb.append(" PACKAGE: ").append(object.getApplicationPackage())
+ .append(" MESSAGE: ").append(object.getText());
+ }
- if (sb.length() != 0) {
- return "System alert popup is visible: " + sb;
+ if (sb.length() != 0) {
+ return "System alert popup is visible: " + sb;
+ }
}
if (hasSystemUiObject("keyguard_status_view")) return "Phone is locked";
if (!mDevice.hasObject(By.textStartsWith(""))) return "Screen is empty";
+
+ final String navigationModeError = getNavigationModeMismatchError();
+ if (navigationModeError != null) return navigationModeError;
} catch (Throwable e) {
Log.w(TAG, "getSystemAnomalyMessage failed", e);
}