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

Commit e692696b authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable protolog by default for WMShell"" into tm-qpr-dev am:... 

Merge "Revert "Enable protolog by default for WMShell"" into tm-qpr-dev am: 178a0bf1 am: 225af7cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21534692



Change-Id: Ie9c633b5bb10e0209561e5f169c7704604f8a564
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9469fbb9 225af7cf

libs/WindowManager/Shell/src/com/android/wm/shell/ProtoLogController.java

+0 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.wm.shell;



import android.os.Build;



import com.android.wm.shell.protolog.ShellProtoLogImpl;

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellInit;
@@ -43,9 +41,6 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 


    void onInit() {

        mShellCommandHandler.addCommandCallback("protolog", this, this);

        if (Build.IS_DEBUGGABLE) {

            mShellProtoLog.startProtoLog(null /* PrintWriter */);

        }

    }



    @Override

libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ import java.io.PrintWriter; 
 */

public class ShellProtoLogImpl extends BaseProtoLogImpl {

    private static final String TAG = "ProtoLogImpl";

    private static final int BUFFER_CAPACITY = 128 * 1024;

    private static final int BUFFER_CAPACITY = 1024 * 1024;

    // TODO: find a proper location to save the protolog message file

    private static final String LOG_FILENAME = "/data/misc/wmtrace/shell_log.winscope";

    private static final String VIEWER_CONFIG_FILENAME = "/system_ext/etc/wmshell.protolog.json.gz";