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

Commit 5ad813f5 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

dumpstate: call printflags instead of reading flag files explicitly 

Now that the printflags device tool exists, dumpstate no longer needs to
read the aconfig files itself. Teach dumpstate to call printflags
instead.

As a bonus, printflags will also include the current flag values as
defined by device_config.

Bug: 302452801
Test: adb bugreport /tmp/bugreport.zip && unzip -c /tmp/bugreport.zip bugreport*.txt | grep --text -A20 -e 'ACONFIG FLAGS'
Change-Id: I6be4aab8dad6e08d2bc0e646224b3682927e34a2
parent da7ca141

cmds/dumpstate/dumpstate.cpp

+3 −8
Original line number Diff line number Diff line
@@ -186,6 +186,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.
@@ -1759,14 +1760,8 @@ static Dumpstate::RunStatus 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"});