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

Commit 17852592 authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

Merge "Extend dumpstate.dry_run restrictions" am: a938daa1 

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

Change-Id: I734d1661d7a46e3063963915700c8ec8a93d49f7
parents 1e8a77e6 a938daa1

cmds/dumpstate/dumpstate.cpp

+26 −17
Original line number Diff line number Diff line
@@ -1237,6 +1237,10 @@ static Dumpstate::RunStatus RunDumpsysTextByPriority(const std::string& title, i 
        std::string path(title);

        path.append(" - ").append(String8(service).c_str());

        size_t bytes_written = 0;

        if (PropertiesHelper::IsDryRun()) {

             dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority);

             dumpsys.writeDumpFooter(STDOUT_FILENO, service, std::chrono::milliseconds(1));

        } else {

            status_t status = dumpsys.startDumpThread(Dumpsys::TYPE_DUMP, service, args);

            if (status == OK) {

                dumpsys.writeDumpHeader(STDOUT_FILENO, service, priority);
@@ -1245,15 +1249,18 @@ static Dumpstate::RunStatus RunDumpsysTextByPriority(const std::string& title, i 
                    service == String16("meminfo")) {

                    // Use a longer timeout for meminfo, since 30s is not always enough.

                    status = dumpsys.writeDump(STDOUT_FILENO, service, 60s,

                                           /* as_proto = */ false, elapsed_seconds, bytes_written);

                                               /* as_proto = */ false, elapsed_seconds,

                                                bytes_written);

                } else {

                    status = dumpsys.writeDump(STDOUT_FILENO, service, service_timeout,

                                           /* as_proto = */ false, elapsed_seconds, bytes_written);

                                               /* as_proto = */ false, elapsed_seconds,

                                                bytes_written);

                }

                dumpsys.writeDumpFooter(STDOUT_FILENO, service, elapsed_seconds);

                bool dump_complete = (status == OK);

                dumpsys.stopDumpThread(dump_complete);

            }

        }



        auto elapsed_duration = std::chrono::duration_cast<std::chrono::milliseconds>(

            std::chrono::steady_clock::now() - start);
@@ -1836,8 +1843,10 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { 
    }



    /* Run some operations that require root. */

    if (!PropertiesHelper::IsDryRun()) {

        ds.tombstone_data_ = GetDumpFds(TOMBSTONE_DIR, TOMBSTONE_FILE_PREFIX, !ds.IsZipping());

        ds.anr_data_ = GetDumpFds(ANR_DIR, ANR_FILE_PREFIX, !ds.IsZipping());

    }



    ds.AddDir(RECOVERY_DIR, true);

    ds.AddDir(RECOVERY_DATA_DIR, true);