fix CI

uutils · Apr 27, 2024 · 915597d · 915597d
1 parent 3c2becc
commit 915597d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/util/android-commands.sh b/util/android-commands.sh
@@ -119,6 +119,13 @@ take_screen_shot() {
     adb exec-out screencap -p > "$filename"
 }
 
+# shellcheck disable=SC2317  # Don't warn about unreachable commands in this function
+check_if_termux_is_active() {
+    dumsys=$(adb shell "dumpsys window windows")
+    echo "dumpsys: $dumsys"
+    echo "$dumsys" | grep -E "imeInputTarget in display# 0 Window{[^}]+com.termux\/com\.termux\.HomeActivity}"
+}
+
 # shellcheck disable=SC2317  # Don't warn about unreachable commands in this function
 adb_shell_start_termux_activity() {
     if ! adb shell 'am start -n com.termux/.HomeActivity'; then
@@ -129,8 +136,7 @@ adb_shell_start_termux_activity() {
     take_screen_shot "launch_termux_after_start_activity"
 
     # the emulator can sometimes be a little slow to launch the app
-    run_with_retry 20 bash -c "sleep 1 && adb shell 'dumpsys window windows' | \
-        grep -E \"imeInputTarget in display# 0 Window{[^}]+com.termux\/com\.termux\.HomeActivity}\""
+    run_with_retry 20 check_if_termux_is_active
 }
 
 launch_termux() {