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

Merge "Support save-for-bugreport command in WMShell" into tm-qpr-dev am: bc8078abdd

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

Change-Id: I7882fea743c34a96c8720ce4355f42b37617959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-02-08 19:33:56 +00:00
committed by Automerger Merge Worker
parent d03e3da89b bc8078abdd
commit a778b301e3
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,15 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio
String[] groups = Arrays.copyOfRange(args, 1, args.length); String[] groups = Arrays.copyOfRange(args, 1, args.length);
return mShellProtoLog.stopTextLogging(groups, pw) == 0; return mShellProtoLog.stopTextLogging(groups, pw) == 0;
} }
case "save-for-bugreport": {
if (!mShellProtoLog.isProtoEnabled()) {
pw.println("Logging to proto is not enabled for WMShell.");
return false;
}
mShellProtoLog.stopProtoLog(pw, true /* writeToFile */);
mShellProtoLog.startProtoLog(pw);
return true;
}
default: { default: {
pw.println("Invalid command: " + args[0]); pw.println("Invalid command: " + args[0]);
printShellCommandHelp(pw, ""); printShellCommandHelp(pw, "");
@@ -108,5 +117,7 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio
pw.println(prefix + " Enable logcat logging for given groups."); pw.println(prefix + " Enable logcat logging for given groups.");
pw.println(prefix + "disable-text [group...]"); pw.println(prefix + "disable-text [group...]");
pw.println(prefix + " Disable logcat logging for given groups."); pw.println(prefix + " Disable logcat logging for given groups.");
pw.println(prefix + "save-for-bugreport");
pw.println(prefix + " Flush proto logging to file, only if it's enabled.");
} }
} }