summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-07-16 11:51:02 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-16 11:51:02 -0700
commit273c079761a6fd289a317d43a493924cb78ca0dc (patch)
tree0ea00b9aa5a3e8f4b509dd740a0117cc05900587
parent6d63bbd4de5dc821a53d44bdbd7e714671cafa8d (diff)
parentd3bff6043aca5d7fc97e947805ca7c17178fbc68 (diff)
downloadpackages_apps_Trebuchet-273c079761a6fd289a317d43a493924cb78ca0dc.tar.gz
packages_apps_Trebuchet-273c079761a6fd289a317d43a493924cb78ca0dc.tar.bz2
packages_apps_Trebuchet-273c079761a6fd289a317d43a493924cb78ca0dc.zip
Merge "Adding message popups to anomaly diagnoser" into ub-launcher3-qt-r1-dev
am: d3bff6043a Change-Id: If99eef3fd22cb2fb2e09e97584a748bf50eef4d1
-rw-r--r--tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0fed337a0..cc403d48f 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -266,11 +266,17 @@ public final class LauncherInstrumentation {
}
private String getAnomalyMessage() {
- final UiObject2 object = mDevice.findObject(By.res("android", "alertTitle"));
+ UiObject2 object = mDevice.findObject(By.res("android", "alertTitle"));
if (object != null) {
return "System alert popup is visible: " + object.getText();
}
+ object = mDevice.findObject(By.res("android", "message"));
+ if (object != null) {
+ return "Message popup by " + object.getApplicationPackage() + " is visible: "
+ + object.getText();
+ }
+
if (hasSystemUiObject("keyguard_status_view")) return "Phone is locked";
if (!mDevice.hasObject(By.textStartsWith(""))) return "Screen is empty";