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

Commit 9d671344 authored by Ted Bauer's avatar Ted Bauer Committed by Automerger Merge Worker
Browse files

Merge "Remove device-side printflags from dumpstate" into main am: d17f9c4b am: ca731fff 

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



Change-Id: I04992cd8ed99e86a7fbfb007c09b19d37648eeae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bb9333a ca731fff

cmds/dumpstate/dumpstate.cpp

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

#define CGROUPFS_DIR "/sys/fs/cgroup"

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

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

#define DROPBOX_DIR "/data/system/dropbox"

#define DROPBOX_DIR "/data/system/dropbox"

#define PRINT_FLAGS "/system/bin/printflags"

#define UWB_LOG_DIR "/data/misc/apexdata/com.android.uwb/log"

#define UWB_LOG_DIR "/data/misc/apexdata/com.android.uwb/log"





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

// TODO(narayan): Since this information has to be kept in sync
@@ -1823,12 +1822,8 @@ Dumpstate::RunStatus Dumpstate::dumpstate() { 
    DumpFile("PRODUCT BUILD-TIME RELEASE FLAGS", "/product/etc/build_flags.json");

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

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

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





    RunCommand("ACONFIG FLAGS", {PRINT_FLAGS},

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

    RunCommand("ACONFIG FLAGS DUMP", {AFLAGS, "list"},

    RunCommand("ACONFIG FLAGS DUMP", {AFLAGS, "list"},

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

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

    RunCommand("WHICH ACONFIG FLAG STORAGE", {AFLAGS, "which-backing"},

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





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

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