From 3096b789146bb769cccca630b1906260036bebc3 Mon Sep 17 00:00:00 2001 From: vadimt Date: Wed, 27 May 2020 11:20:22 -0700 Subject: [PATCH] Add navigation mode diags to the system anomaly detection Bug: 156095088 Change-Id: I3504cc2187c4bcc6229ecbcb0da360e310eeaa9f --- .../tapl/LauncherInstrumentation.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 9c92a26972..08c721a37a 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -332,26 +332,31 @@ public final class LauncherInstrumentation { 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); }