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

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

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

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



Change-Id: I11efc327900afdbaebaa69cff011ded943dab019
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 906767d5 a778b301

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

+11 −0
Original line number Diff line number Diff line
@@ -84,6 +84,15 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 
                String[] groups = Arrays.copyOfRange(args, 1, args.length);

                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: {

                pw.println("Invalid command: " + args[0]);

                printShellCommandHelp(pw, "");
@@ -108,5 +117,7 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 
        pw.println(prefix + "  Enable logcat logging for given groups.");

        pw.println(prefix + "disable-text [group...]");

        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.");

    }

}