aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Improving diagnostics for objects disappearing from screen" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-22 03:33:19 +00:00
committed by Android (Google) Code Review
parent 818ed4b794 c636900a90
commit 5dae3f3162
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/tapl/com/android/launcher3/tapl/AllApps.java
View File

@@ -25,6 +25,7 @@ import androidx.annotation.NonNull;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
import androidx.test.uiautomator.Direction;
import androidx.test.uiautomator.StaleObjectException;
import androidx.test.uiautomator.UiObject2;
import com.android.launcher3.testing.TestProtocol;
@@ -61,7 +62,13 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
private boolean hasClickableIcon(UiObject2 allAppsContainer, UiObject2 appListRecycler,
BySelector appIconSelector, int displayBottom) {
final UiObject2 icon = appListRecycler.findObject(appIconSelector);
final UiObject2 icon;
try {
icon = appListRecycler.findObject(appIconSelector);
} catch (StaleObjectException e) {
mLauncher.fail("All apps recycler disappeared from screen");
return false;
}
if (icon == null) {
LauncherInstrumentation.log("hasClickableIcon: icon not visible");
return false;

5
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -496,7 +496,7 @@ public final class LauncherInstrumentation {
}
}
private void fail(String message) {
void fail(String message) {
checkForAnomaly();
Assert.fail(formatSystemHealthMessage(formatErrorWithEvents(
"http://go/tapl test failure:\nSummary: " + getContextDescription()
@@ -1449,6 +1449,9 @@ public final class LauncherInstrumentation {
Rect getVisibleBounds(UiObject2 object) {
try {
return object.getVisibleBounds();
} catch (StaleObjectException e) {
fail("Object " + object + " disappeared from screen");
return null;
} catch (Throwable t) {
fail(t.toString());
return null;