diff options
| author | Nataniel Borges <natanieljr@google.com> | 2023-01-09 21:19:32 +0000 |
|---|---|---|
| committer | Nataniel Borges <natanieljr@google.com> | 2023-01-10 10:22:22 +0000 |
| commit | 48ef808621a604b806e1cafc4b5c220467003dad (patch) | |
| tree | 853a9b3b2d6bbd02a6485989e78becfb7368c870 | |
| parent | 17dc2742ceeda00f2a79a3b37288791959d47293 (diff) | |
| download | development-android13-qpr3-c-s7-release.tar.gz | |
[DO NOT MERGE] Update adb proxy on tm-qpr-devandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release
This will help those working on tm-dev to run the new winscope, without having to download an additional file.
Change-Id: I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1
Fixes: 264719130
Test: run the proxy, open go/winscope and check if it can collect traces
| -rwxr-xr-x | tools/winscope/adb_proxy/winscope_proxy.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/winscope/adb_proxy/winscope_proxy.py b/tools/winscope/adb_proxy/winscope_proxy.py index b1c489249..87ccecc4e 100755 --- a/tools/winscope/adb_proxy/winscope_proxy.py +++ b/tools/winscope/adb_proxy/winscope_proxy.py @@ -46,8 +46,8 @@ LOG_LEVEL = logging.DEBUG PORT = 5544 -# Keep in sync with WINSCOPE_PROXY_VERSION in Winscope DataAdb.vue -VERSION = '0.8' +# Keep in sync with ProxyClient#VERSION in Winscope +VERSION = '1.0' WINSCOPE_VERSION_HEADER = "Winscope-Proxy-Version" WINSCOPE_TOKEN_HEADER = "Winscope-Token" @@ -200,8 +200,7 @@ class SurfaceFlingerTraceConfig: """ def __init__(self) -> None: - # default config flags CRITICAL | INPUT | SYNC - self.flags = 1 << 0 | 1 << 1 | 1 << 6 + self.flags = 0 def add(self, config: str) -> None: self.flags |= CONFIG_FLAG[config] @@ -260,10 +259,12 @@ class WindowManagerTraceSelectedConfig: CONFIG_FLAG = { + "input": 1 << 1, "composition": 1 << 2, "metadata": 1 << 3, "hwc": 1 << 4, - "tracebuffers": 1 << 5 + "tracebuffers": 1 << 5, + "virtualdisplays": 1 << 6 } #Keep up to date with options in DataAdb.vue @@ -547,7 +548,7 @@ class FetchFilesEndpoint(DeviceRequestEndpoint): def check_root(device_id): log.debug("Checking root access on {}".format(device_id)) - return call_adb('shell su root id -u', device_id) == "0\n" + return int(call_adb('shell su root id -u', device_id)) == 0 TRACE_THREADS = {} @@ -864,4 +865,4 @@ if __name__ == '__main__': try: httpd.serve_forever() except KeyboardInterrupt: - log.info("Shutting down") + log.info("Shutting down")
\ No newline at end of file |