Merge "Update winscope proxy to version 1.0" am: 20b563e65e am: 1130743c2c

Original change: https://android-review.googlesource.com/c/platform/development/+/2379888

Change-Id: Ic5ccb4f15ce4830c71d52fae6d7c9a9d1e04b6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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