From 866e966e1f133ea07881457379d8895012b41ffc Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Tue, 20 Jul 2021 21:31:37 +0200 Subject: [PATCH] Introduce a .winscope extension for all winscope files This extension will be used to better integrate winscope traces and ABT, allowing trace files to be opened directly from ABT or buganizer Bug: 192663722 Bug: 162813517 Test: (for winscope) build winscope, record traces, download traces, check if traces have the .winscope extension. (for flicker) run atest Flickertests. (for abt) on new extension, check if .winscope files show as "open in winscope" on buganizer Change-Id: If669a1f41f1eab850d8a4715dbe601bb35fe01bb --- .../android/internal/inputmethod/ImeTracingServerImpl.java | 6 +++--- core/java/com/android/internal/protolog/ProtoLogImpl.java | 2 +- .../java/com/android/server/wm/AccessibilityController.java | 4 +++- services/core/java/com/android/server/wm/WindowTracing.java | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/java/com/android/internal/inputmethod/ImeTracingServerImpl.java b/core/java/com/android/internal/inputmethod/ImeTracingServerImpl.java index d452e60eb1dd8..20ff83f5f68e6 100644 --- a/core/java/com/android/internal/inputmethod/ImeTracingServerImpl.java +++ b/core/java/com/android/internal/inputmethod/ImeTracingServerImpl.java @@ -40,9 +40,9 @@ import java.io.PrintWriter; */ class ImeTracingServerImpl extends ImeTracing { private static final String TRACE_DIRNAME = "/data/misc/wmtrace/"; - private static final String TRACE_FILENAME_CLIENTS = "ime_trace_clients.pb"; - private static final String TRACE_FILENAME_IMS = "ime_trace_service.pb"; - private static final String TRACE_FILENAME_IMMS = "ime_trace_managerservice.pb"; + private static final String TRACE_FILENAME_CLIENTS = "ime_trace_clients.winscope"; + private static final String TRACE_FILENAME_IMS = "ime_trace_service.winscope"; + private static final String TRACE_FILENAME_IMMS = "ime_trace_managerservice.winscope"; private static final int BUFFER_CAPACITY = 4096 * 1024; // Needed for winscope to auto-detect the dump type. Explained further in diff --git a/core/java/com/android/internal/protolog/ProtoLogImpl.java b/core/java/com/android/internal/protolog/ProtoLogImpl.java index 10224a4b9db6e..353c6c083d9df 100644 --- a/core/java/com/android/internal/protolog/ProtoLogImpl.java +++ b/core/java/com/android/internal/protolog/ProtoLogImpl.java @@ -28,7 +28,7 @@ import java.io.File; */ public class ProtoLogImpl extends BaseProtoLogImpl { private static final int BUFFER_CAPACITY = 1024 * 1024; - private static final String LOG_FILENAME = "/data/misc/wmtrace/wm_log.pb"; + private static final String LOG_FILENAME = "/data/misc/wmtrace/wm_log.winscope"; private static final String VIEWER_CONFIG_FILENAME = "/system/etc/protolog.conf.json.gz"; private static ProtoLogImpl sServiceInstance = null; diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 54d97eea15211..26d63749d6394 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -43,6 +43,7 @@ import static com.android.server.accessibility.AccessibilityTraceProto.WHERE; import static com.android.server.accessibility.AccessibilityTraceProto.WINDOW_MANAGER_SERVICE; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; +import static com.android.server.wm.WindowTracing.WINSCOPE_EXT; import static com.android.server.wm.utils.RegionUtils.forEachRect; import android.accessibilityservice.AccessibilityTrace; @@ -2079,7 +2080,8 @@ final class AccessibilityController { } private static final int BUFFER_CAPACITY = 1024 * 1024 * 12; - private static final String TRACE_FILENAME = "/data/misc/a11ytrace/a11y_trace.pb"; + private static final String TRACE_FILENAME = "/data/misc/a11ytrace/a11y_trace" + + WINSCOPE_EXT; private static final String TAG = "AccessibilityTracing"; private static final long MAGIC_NUMBER_VALUE = ((long) MAGIC_NUMBER_H << 32) | MAGIC_NUMBER_L; diff --git a/services/core/java/com/android/server/wm/WindowTracing.java b/services/core/java/com/android/server/wm/WindowTracing.java index 0bb97f560a1cd..6204824d70a98 100644 --- a/services/core/java/com/android/server/wm/WindowTracing.java +++ b/services/core/java/com/android/server/wm/WindowTracing.java @@ -54,7 +54,8 @@ class WindowTracing { private static final int BUFFER_CAPACITY_CRITICAL = 512 * 1024; private static final int BUFFER_CAPACITY_TRIM = 2048 * 1024; private static final int BUFFER_CAPACITY_ALL = 4096 * 1024; - private static final String TRACE_FILENAME = "/data/misc/wmtrace/wm_trace.pb"; + static final String WINSCOPE_EXT = ".winscope"; + private static final String TRACE_FILENAME = "/data/misc/wmtrace/wm_trace" + WINSCOPE_EXT; private static final String TAG = "WindowTracing"; private static final long MAGIC_NUMBER_VALUE = ((long) MAGIC_NUMBER_H << 32) | MAGIC_NUMBER_L;