From 4a55472cf3e539d86d0dba17cef553495fcf163d Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Tue, 11 Feb 2025 22:28:53 +0000
Subject: [PATCH] Check if device is online before starting 16kb test

Test: atest -c Enable16KbTest
Bug: 390535191
Change-Id: I32cc404f8e84fba0e90ecb5b801d98908242292d
---
 .../src/com/android/test/Enable16KbTest.java               | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java b/tests/Enable16KbTests/src/com/android/test/Enable16KbTest.java
index e4ebdefb1a5..8e8dba82d7d 100644
--- 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();