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

Commit 304a97ce authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Reduce timeouts for occasionally-stalling sections" am: 0ac5e458 am: 251493d8 

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



Change-Id: I60c911a1645a4fbf709b2c20bec79214e59b117a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb5d2e1a 251493d8

cmds/dumpstate/dumpstate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ static void DumpIncidentReport() { 
        MYLOGE("Could not open %s to dump incident report.\n", path.c_str());

        return;

    }

    RunCommandToFd(fd, "", {"incident", "-u"}, CommandOptions::WithTimeout(120).Build());

    RunCommandToFd(fd, "", {"incident", "-u"}, CommandOptions::WithTimeout(20).Build());

    bool empty = 0 == lseek(fd, 0, SEEK_END);

    if (!empty) {

        // Use a different name from "incident.proto"
@@ -1066,7 +1066,7 @@ static void DumpVisibleWindowViews() { 
        return;

    }

    RunCommandToFd(fd, "", {"cmd", "window", "dump-visible-window-views"},

                   CommandOptions::WithTimeout(120).Build());

                   CommandOptions::WithTimeout(10).Build());

    bool empty = 0 == lseek(fd, 0, SEEK_END);

    if (!empty) {

        ds.AddZipEntry("visible_windows.zip", path);