Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
[DO NOT MERGE] Update adb proxy on tm-qpr-dev
Change-Id: Ic77b4ee06d86b217f383cc60f9ad782da8e9bdf8
diff --git a/tools/winscope/adb_proxy/winscope_proxy.py b/tools/winscope/adb_proxy/winscope_proxy.py
index b1c4892..87ccecc 100755
--- a/tools/winscope/adb_proxy/winscope_proxy.py
+++ b/tools/winscope/adb_proxy/winscope_proxy.py
@@ -46,8 +46,8 @@
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 @@
"""
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 @@
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 @@
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 @@
try:
httpd.serve_forever()
except KeyboardInterrupt:
- log.info("Shutting down")
+ log.info("Shutting down")
\ No newline at end of file