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

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

Change-Id: Ie9c633b5bb10e0209561e5f169c7704604f8a564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-02-23 00:54:49 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 6 deletions

View File

@@ -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

View File

@@ -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";