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

Commit cc89e85f authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Automerger Merge Worker
Browse files

Merge "dumpstate: call printflags instead of reading flag files explicitly"... 

Merge "dumpstate: call printflags instead of reading flag files explicitly" into main am: efed5f13 am: 9164be59 am: fb3beb5e am: 214dab03 am: 15f0579e

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



Change-Id: I058475ad585c135d167559cf06011a2c6976b3cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c033dfbb 15f0579e

cmds/dumpstate/dumpstate.cpp

+3 −8
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ void add_mountinfo(); 
#define CGROUPFS_DIR "/sys/fs/cgroup"

#define SDK_EXT_INFO "/apex/com.android.sdkext/bin/derive_sdk"

#define DROPBOX_DIR "/data/system/dropbox"

#define PRINT_FLAGS "/system/bin/printflags"



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

// with tombstoned, we should just put it in a common header.
@@ -1763,14 +1764,8 @@ Dumpstate::RunStatus Dumpstate::dumpstate() { 
    DumpFile("PRODUCT BUILD-TIME RELEASE FLAGS", "/product/etc/build_flags.json");

    DumpFile("VENDOR BUILD-TIME RELEASE FLAGS", "/vendor/etc/build_flags.json");



    DumpFile("SYSTEM BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime values)",

            "/system/etc/aconfig_flags.textproto");

    DumpFile("SYSTEM_EXT BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime"

            " values)", "/system_ext/etc/aconfig_flags.textproto");

    DumpFile("PRODUCT BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime values)",

            "/product/etc/aconfig_flags.textproto");

    DumpFile("VENDOR BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime values)",

            "/vendor/etc/aconfig_flags.textproto");

    RunCommand("ACONFIG FLAGS", {PRINT_FLAGS},

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



    RunCommand("STORAGED IO INFO", {"storaged", "-u", "-p"});