Merge "Check if device is online before starting 16kb test" into main

2025-02-14 10:40:31 -08:00
parent 9dc07f4e19 4a55472cf3
commit 7ee0e07a50
1 changed files with 6 additions and 1 deletions
--- a/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
+++ b/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
@@ -51,7 +51,12 @@ public class Enable16KbTest extends BaseHostJUnit4Test {
    @Test
    @AppModeFull
    public void enable16KbToggle() throws Exception {
-        assertTrue(isPackageInstalled(APP_PACKAGE));
+        // Wait for 2 mins device to be online
+        getDevice().waitForDeviceOnline(120000);
+        if (!isPackageInstalled(APP_PACKAGE)) {
+            //If test app has failed for some reason, retry installation
+            installTestApp();
+        }

        // Check if developer option is enabled otherwise exit
        getDevice().enableAdbRoot();