commit f40413134892be151ee7aa9274109836d260f4d0
author Android Build Prod User <android-build-prod@system.gserviceaccount.com> Tue Aug 24 21:50:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 24 21:50:12 2021 +0000
tree 812749da659dda5dc05aeed36b0496446b9f3921
parent 31663954663a44926396ff71b7f0bc4a965b6720
parent 05e0d86c733d4ae4d2310a4acd8241d7222dc4de

Merge "Improving diags for containers disappearing while getting children" into sc-v2-dev am: 497a6ad826 am: 05e0d86c73

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15602554

Change-Id: I1c54a2fb06c0623bd3d9aff567ab9c2599fcf3ac

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 9264b8a..7c73f2b 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1033,6 +1033,15 @@
         }
     }
 
+    List<UiObject2> getChildren(UiObject2 container) {
+        try {
+            return container.getChildren();
+        } catch (StaleObjectException e) {
+            fail("The container disappeared from screen");
+            return null;
+        }
+    }
+
     private boolean hasLauncherObject(String resId) {
         return mDevice.hasObject(getLauncherObjectSelector(resId));
     }

tests/tapl/com/android/launcher3/tapl/Widgets.java

diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 99d9889..6e7264a 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -116,9 +116,9 @@
                     "widget_preview");
             int i = 0;
             for (; ; ) {
-                final Collection<UiObject2> tableRows = widgetsContainer.getChildren();
+                final Collection<UiObject2> tableRows = mLauncher.getChildren(widgetsContainer);
                 for (UiObject2 row : tableRows) {
-                    final Collection<UiObject2> widgetCells = row.getChildren();
+                    final Collection<UiObject2> widgetCells = mLauncher.getChildren(row);
                     for (UiObject2 widget : widgetCells) {
                         final UiObject2 label = mLauncher.findObjectInContainer(widget,
                                 labelSelector);