Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Revert "Enable protolog by default for WMShell"" into tm-qpr-dev am: 178a0bf195 am: 225af7cf7a" into udc-dev

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-02-23 00:55:47 +00:00
committed by Android (Google) Code Review
parent d636ddc6a4 e692696b7a
commit b6b98eb9ed
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,6 @@
package com.android.wm.shell; package com.android.wm.shell;
import android.os.Build;
import com.android.wm.shell.protolog.ShellProtoLogImpl; import com.android.wm.shell.protolog.ShellProtoLogImpl;
import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellCommandHandler;
import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.sysui.ShellInit;
@@ -43,9 +41,6 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio
void onInit() { void onInit() {
mShellCommandHandler.addCommandCallback("protolog", this, this); mShellCommandHandler.addCommandCallback("protolog", this, this);
if (Build.IS_DEBUGGABLE) {
mShellProtoLog.startProtoLog(null /* PrintWriter */);
}
} }
@Override @Override

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

@@ -31,7 +31,8 @@ import java.io.PrintWriter;
*/ */
public class ShellProtoLogImpl extends BaseProtoLogImpl { public class ShellProtoLogImpl extends BaseProtoLogImpl {
private static final String TAG = "ProtoLogImpl"; 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 LOG_FILENAME = "/data/misc/wmtrace/shell_log.winscope";
private static final String VIEWER_CONFIG_FILENAME = "/system_ext/etc/wmshell.protolog.json.gz"; private static final String VIEWER_CONFIG_FILENAME = "/system_ext/etc/wmshell.protolog.json.gz";