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

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

Merge "Include WMShell protolog in bug-report" am: 90765fd0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2413712



Change-Id: I6c41bea6c667003f0992c94808751130bf70a628
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4023b99f 90765fd0

cmds/dumpstate/dumpstate.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -3244,6 +3244,15 @@ void Dumpstate::MaybeSnapshotSystemTrace() { 
}

}





void Dumpstate::MaybeSnapshotWinTrace() {

void Dumpstate::MaybeSnapshotWinTrace() {

    // Include the proto logging from WMShell.

    RunCommand(

        // Empty name because it's not intended to be classified as a bugreport section.

        // Actual logging files can be found as "/data/misc/wmtrace/shell_log.winscope"

        // in the bugreport.

        "", {"dumpsys", "activity", "service", "SystemUIService",

             "WMShell", "protolog", "save-for-bugreport"},

        CommandOptions::WithTimeout(10).Always().DropRoot().RedirectStderr().Build());



    // Currently WindowManagerService and InputMethodManagerSerivice support WinScope protocol.

    // Currently WindowManagerService and InputMethodManagerSerivice support WinScope protocol.

    for (const auto& service : {"window", "input_method"}) {

    for (const auto& service : {"window", "input_method"}) {

        RunCommand(

        RunCommand(