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

Commit 8ea9d2a1 authored by Li Li's avatar Li Li Committed by Automerger Merge Worker
Browse files

Merge "Include freezer cgroupfs info in bugreport" into sc-dev am: 80e30bd8 

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

Change-Id: Ie4f8eeae2ec72b4d9f51d08eae0945e79e348032
parents f71e3612 80e30bd8

cmds/dumpstate/dumpstate.cpp

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ void add_mountinfo(); 
#define LINKERCONFIG_DIR "/linkerconfig"

#define PACKAGE_DEX_USE_LIST "/data/system/package-dex-usage.list"

#define SYSTEM_TRACE_SNAPSHOT "/data/misc/perfetto-traces/bugreport/systrace.pftrace"

#define CGROUPFS_DIR "/sys/fs/cgroup"



// TODO(narayan): Since this information has to be kept in sync

// with tombstoned, we should just put it in a common header.
@@ -1785,6 +1786,9 @@ static Dumpstate::RunStatus dumpstate() { 
    // Add linker configuration directory

    ds.AddDir(LINKERCONFIG_DIR, true);



    /* Dump cgroupfs */

    ds.AddDir(CGROUPFS_DIR, true);



    if (ds.dump_pool_) {

        WAIT_TASK_WITH_CONSENT_CHECK(DUMP_INCIDENT_REPORT_TASK, ds.dump_pool_);

    } else {