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

Commit a216ecb3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Let dumpstate also call "cmd input_method tracing save-for-bugreport""...

Merge "Let dumpstate also call "cmd input_method tracing save-for-bugreport"" am: d17fa39d am: d61cb088 am: a6926bd1

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

Change-Id: Ibed214c1499d8100cd12b46c2948139b61625f9c
parents b40ac209 a6926bd1
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -3027,12 +3027,15 @@ void Dumpstate::MaybeSnapshotSystemTrace() {
}

void Dumpstate::MaybeSnapshotWinTrace() {
    // Currently WindowManagerService and InputMethodManagerSerivice support WinScope protocol.
    for (const auto& service : {"window", "input_method"}) {
        RunCommand(
            // Empty name because it's not intended to be classified as a bugreport section.
            // Actual tracing files can be found in "/data/misc/wmtrace/" in the bugreport.
        "", {"cmd", "window", "tracing", "save-for-bugreport"},
            "", {"cmd", service, "tracing", "save-for-bugreport"},
            CommandOptions::WithTimeout(10).Always().DropRoot().RedirectStderr().Build());
    }
}

void Dumpstate::onUiIntensiveBugreportDumpsFinished(int32_t calling_uid) {
    if (calling_uid == AID_SHELL || !CalledByApi()) {