From cd18bdb3dc7f82993cf012d39668d150a1df404f Mon Sep 17 00:00:00 2001
From: Muaz Kadan <32595066+muazkadan@users.noreply.github.com>
Date: Thu, 15 Oct 2026 16:47:01 +0300
Subject: [PATCH] Fix deploy_local.sh and droiddeckctl not finding a phone
 connected over wireless debugging (#864)

---
 tools/adb_device.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/adb_device.py b/tools/adb_device.py
index 9b113c5d0..e77705a74 100755
--- a/tools/adb_device.py
+++ b/tools/adb_device.py
@@ -29,9 +29,9 @@ def _device_list(adb: str) -> list[str]:
         raise DeviceResolutionError(result.stderr.strip() or "adb devices failed")
     devices = []
     for line in result.stdout.splitlines()[1:]:
-        fields = line.split()
-        if len(fields) >= 2 and fields[1] == "device":
-            devices.append(fields[0])
+        match = re.match(r"^(.+?)\s+device(?:\s+\S+:\S+)*\s*$", line)
+        if match:
+            devices.append(match.group(1))
     return devices