Skip to content

Commit 5a3ce17

Browse files
committed
Changed variable name
1 parent 0519e1f commit 5a3ce17

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/build-android-app.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,22 +1100,22 @@ adb_framework_ready_once() {
11001100
fi
11011101

11021102
# Success conditions - prioritize package manager over activity manager for API 35
1103-
if [ -n "$system_server" ] && [ $pm_ok -eq 1 ] && [ $pm_list_ok -eq 1 ] && [ $service_ok -eq 1 ]; then
1104-
ba_log "Android framework ready on $serial (system_server=$system_server; package manager operational)"
1103+
if [ -n "system_pid" ] && [ $pm_ok -eq 1 ] && [ $pm_list_ok -eq 1 ] && [ $service_ok -eq 1 ]; then
1104+
ba_log "Android framework ready on $serial (system_server=$system_pid; package manager operational)"
11051105
return 0
11061106
fi
11071107

11081108
# Fallback: if boot is complete and PM works, proceed even without full activity manager
11091109
if [ "$sys_boot" = "1" ] && [ $pm_ok -eq 1 ] && [ $pm_list_ok -eq 1 ]; then
11101110
local time_waiting=$((SECONDS - start_time))
11111111
if [ $time_waiting -ge 120 ]; then
1112-
ba_log "Android framework heuristically ready on $serial after ${time_waiting}s (system_server=$system_server; pm functional but activity_manager slow)"
1112+
ba_log "Android framework heuristically ready on $serial after ${time_waiting}s (system_server=$system_pid; pm functional but activity_manager slow)"
11131113
return 0
11141114
fi
11151115
fi
11161116

11171117
# Original stricter check for early success
1118-
if [ "$boot_ok" = "1" ] && [ "$dev_boot" = "1" ] && [ -n "$system_server" ] \
1118+
if [ "$boot_ok" = "1" ] && [ "$dev_boot" = "1" ] && [ -n "$system_pid" ] \
11191119
&& [ $pm_ok -eq 1 ] && [ $cmd_ok -eq 1 ] && [ $service_ok -eq 1 ]; then
11201120
if [ $pm_list_ok -eq 1 ] || [ $activity_ok -eq 1 ] || [ $resolve_ok -eq 1 ]; then ba_log "Android framework ready on $serial (system_server=$system_pid)"
11211121
return 0

0 commit comments

Comments
 (0)