Support remote devices in winscope proxy
Currently Winscope proxy doesn't support devices with a model name
containing '.' or ':'. These are necessary for remotely connected
devices, where the device model is in the format IP:PORT
Bug: 165535205
Test: connect to remote device and capture a trace through winscope
Change-Id: Iacc1dcb9fe4f6f07a2b7677b4b70ad8c332551c0
diff --git a/tools/winscope/adb_proxy/winscope_proxy.py b/tools/winscope/adb_proxy/winscope_proxy.py
index 99f3fff..c2c03a3 100755
--- a/tools/winscope/adb_proxy/winscope_proxy.py
+++ b/tools/winscope/adb_proxy/winscope_proxy.py
@@ -287,7 +287,7 @@
class ListDevicesEndpoint(RequestEndpoint):
- ADB_INFO_RE = re.compile("^([A-Za-z0-9\\-]+)\\s+(\\w+)(.*model:(\\w+))?")
+ ADB_INFO_RE = re.compile("^([A-Za-z0-9.:\\-]+)\\s+(\\w+)(.*model:(\\w+))?")
def process(self, server, path):
lines = list(filter(None, call_adb('devices -l').split('\n')))
@@ -302,7 +302,7 @@
class DeviceRequestEndpoint(RequestEndpoint):
def process(self, server, path):
- if len(path) > 0 and re.fullmatch("[A-Za-z0-9\\-]+", path[0]):
+ if len(path) > 0 and re.fullmatch("[A-Za-z0-9.:\\-]+", path[0]):
self.process_with_device(server, path[1:], path[0])
else:
raise BadRequest("Device id not specified")
