Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 866e966e authored by Nataniel Borges's avatar Nataniel Borges
Browse files

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
parent 31409808

core/java/com/android/internal/inputmethod/ImeTracingServerImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -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

core/java/com/android/internal/protolog/ProtoLogImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/wm/AccessibilityController.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/wm/WindowTracing.java

+2 −1
Original line number Diff line number Diff line
@@ -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;