commit 9a1bad62574d0ab44f47d93ef182bf276f13241c
author David Anderson <dvander@google.com> Mon Dec 23 19:22:02 2024 +0000
committer David Anderson <dvander@google.com> Mon Dec 23 19:24:56 2024 +0000
tree e6951a80553ae60d9f5e2270897fb43bec2029b4
parent 3c6e5671e157d0f26e9c42e23bda2b8d8f78088a

Fix flash_device when used with pontis.

local_flashstation expects a real serial number, not an endpoint. Work
around this by grabbing the serial number in get_device_info() if a
remote endpoint is detected.

Note this fixes flashing, but waiting for adb will still fail if
flash_device was used over a remote fastboot connection.

Bug: N/A
Test: flash_device with fastboot or adb over pontis
Change-Id: I45dbb8489d52269f5ec00f0f87ceb57b9c4b98ec

tools/flash_device.sh

diff --git a/tools/flash_device.sh b/tools/flash_device.sh
index 52b7d68..f8b97e3 100755
--- a/tools/flash_device.sh
+++ b/tools/flash_device.sh
@@ -617,7 +617,7 @@
             flash_cmd="${ANDROID_HOST_OUT}/bin/local_flashstation"
         fi
 
-        flash_cmd+=" --nointeractive --force_flash_partitions --disable_verity --disable_verification  -w -s $SERIAL_NUMBER"
+        flash_cmd+=" --nointeractive --force_flash_partitions --disable_verity --disable_verification  -w -s $FLASHSTATION_SERIAL_NUMBER"
         print_info "Flash device with: $flash_cmd" "$LINENO"
         eval "$flash_cmd"
         exit_code=$?
@@ -826,6 +826,7 @@
 
 function get_device_info {
     adb_count=$(adb devices | grep "$SERIAL_NUMBER" | wc -l)
+    FLASHSTATION_SERIAL_NUMBER=${SERIAL_NUMBER}
     if (( adb_count > 0 )); then
         BOARD=$(adb -s "$SERIAL_NUMBER" shell getprop ro.product.board)
         ABI=$(adb -s "$SERIAL_NUMBER" shell getprop ro.product.cpu.abi)
@@ -834,6 +835,9 @@
         DEVICE_KERNEL_STRING=$(adb -s "$SERIAL_NUMBER" shell uname -r)
         extract_device_kernel_version "$DEVICE_KERNEL_STRING"
         SYSTEM_DLKM_INFO=$(adb -s "$SERIAL_NUMBER" shell getprop dev.mnt.blk.system_dlkm)
+        if [[ "$SERIAL_NUMBER" == localhost:* ]]; then
+            FLASHSTATION_SERIAL_NUMBER=$(adb shell getprop ro.serialno)
+        fi
         print_info "device info: BOARD=$BOARD, ABI=$ABI, PRODUCT=$PRODUCT, BUILD_TYPE=$BUILD_TYPE" "$LINENO"
         print_info "device info: SYSTEM_DLKM_INFO=$SYSTEM_DLKM_INFO, DEVICE_KERNEL_STRING=$DEVICE_KERNEL_STRING" "$LINENO"
         return 0
@@ -844,6 +848,10 @@
         local output=$(fastboot -s "$SERIAL_NUMBER" getvar product 2>&1)
         PRODUCT=$(echo "$output" | grep -oP '^product:\s*\K.*' | cut -d' ' -f1)
         print_info "$SERIAL_NUMBER is in fastboot with device info: PRODUCT=$PRODUCT" "$LINENO"
+        if [[ "$SERIAL_NUMBER" == tcp:* ]]; then
+            local text=$(fastboot getvar serialno 2>&1)
+            FLASHSTATION_SERIAL_NUMBER=$(echo "${text}" | grep -Po "serialno: [A-Z0-9]+" | cut -c 11-)
+        fi
         return 0
     fi
     print_error "$SERIAL_NUMBER is not connected with adb or fastboot"