LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Support multiple devices in winscope proxy" into tm-dev am: 9ac33a4a0e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17760468

Change-Id: I813acbb37afe1977799ef0a43ef6146f3a44b5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-15 11:16:23 +00:00
committed by Automerger Merge Worker
parent 57a18247f9 9ac33a4a0e
commit 08a7addcc3
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/winscope/adb_proxy/winscope_proxy.py
View File

@@ -451,14 +451,26 @@ def call_adb_outfile(params: str, outfile, device: str = None, stdin: bytes = No
class CheckWaylandServiceEndpoint(RequestEndpoint): class CheckWaylandServiceEndpoint(RequestEndpoint):
_listDevicesEndpoint = None
def __init__(self, listDevicesEndpoint):
self._listDevicesEndpoint = listDevicesEndpoint
def process(self, server, path): def process(self, server, path):
raw_res = call_adb('shell service check Wayland') self._listDevicesEndpoint.process(server, path)
res = 'false' if 'not found' in raw_res else 'true' foundDevices = self._listDevicesEndpoint._foundDevices
if len(foundDevices) > 1:
res = 'false'
else:
raw_res = call_adb('shell service check Wayland')
res = 'false' if 'not found' in raw_res else 'true'
server.respond(HTTPStatus.OK, res.encode("utf-8"), "text/json") server.respond(HTTPStatus.OK, res.encode("utf-8"), "text/json")
class ListDevicesEndpoint(RequestEndpoint): 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+))?")
_foundDevices = None
def process(self, server, path): def process(self, server, path):
lines = list(filter(None, call_adb('devices -l').split('\n'))) lines = list(filter(None, call_adb('devices -l').split('\n')))
@@ -466,6 +478,7 @@ class ListDevicesEndpoint(RequestEndpoint):
'authorised': str(m.group(2)) != 'unauthorized', 'authorised': str(m.group(2)) != 'unauthorized',
'model': m.group(4).replace('_', ' ') if m.group(4) else '' 'model': m.group(4).replace('_', ' ') if m.group(4) else ''
} for m in [ListDevicesEndpoint.ADB_INFO_RE.match(d) for d in lines[1:]] if m} } for m in [ListDevicesEndpoint.ADB_INFO_RE.match(d) for d in lines[1:]] if m}
self._foundDevices = devices
j = json.dumps(devices) j = json.dumps(devices)
log.debug("Detected devices: " + j) log.debug("Detected devices: " + j)
server.respond(HTTPStatus.OK, j.encode("utf-8"), "text/json") server.respond(HTTPStatus.OK, j.encode("utf-8"), "text/json")
@@ -801,8 +814,9 @@ class DumpEndpoint(DeviceRequestEndpoint):
class ADBWinscopeProxy(BaseHTTPRequestHandler): class ADBWinscopeProxy(BaseHTTPRequestHandler):
def __init__(self, request, client_address, server): def __init__(self, request, client_address, server):
self.router = RequestRouter(self) self.router = RequestRouter(self)
listDevicesEndpoint = ListDevicesEndpoint()
self.router.register_endpoint( self.router.register_endpoint(
RequestType.GET, "devices", ListDevicesEndpoint()) RequestType.GET, "devices", listDevicesEndpoint)
self.router.register_endpoint( self.router.register_endpoint(
RequestType.GET, "status", StatusEndpoint()) RequestType.GET, "status", StatusEndpoint())
self.router.register_endpoint( self.router.register_endpoint(
@@ -817,7 +831,7 @@ class ADBWinscopeProxy(BaseHTTPRequestHandler):
self.router.register_endpoint( self.router.register_endpoint(
RequestType.POST, "selectedwmconfigtrace", WindowManagerSelectedConfigTrace()) RequestType.POST, "selectedwmconfigtrace", WindowManagerSelectedConfigTrace())
self.router.register_endpoint( self.router.register_endpoint(
RequestType.GET, "checkwayland", CheckWaylandServiceEndpoint()) RequestType.GET, "checkwayland", CheckWaylandServiceEndpoint(listDevicesEndpoint))
super().__init__(request, client_address, server) super().__init__(request, client_address, server)
def respond(self, code: int, data: bytes, mime: str) -> None: def respond(self, code: int, data: bytes, mime: str) -> None: