From f6d61b844397acca58d8fa50289b4ef2402aef69 Mon Sep 17 00:00:00 2001 From: Ted Bauer Date: Fri, 13 Sep 2024 19:57:19 +0000 Subject: Read from aflags in dumpstate Aconfig flag storage will be ramped imminently, so add a dump of the new storage to bugreports. The dump will dump DeviceConfig if the new storage is disabled, and the new storage if it's enabled. Test: adb bugreport /tmp/bugreport.zip && unzip -c /tmp/bugreport.zip bugreport*.txt | grep 'ACONFIG FLAGS DUMP' Test: adb bugreport /tmp/bugreport.zip && unzip -c /tmp/bugreport.zip bugreport*.txt | grep 'WHICH ACONFIG FLAG STORAGE' Bug: 324436145 Change-Id: If89f62b003d2a7285e9e915d831b36ab84ca43c3 --- cmds/dumpstate/dumpstate.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cmds/dumpstate/dumpstate.cpp') diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 6576ffdc54..c407f486f0 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -170,6 +170,7 @@ void add_mountinfo(); #define ALT_PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops-0" #define BLK_DEV_SYS_DIR "/sys/block" +#define AFLAGS "/system/bin/aflags" #define RECOVERY_DIR "/cache/recovery" #define RECOVERY_DATA_DIR "/data/misc/recovery" #define UPDATE_ENGINE_LOG_DIR "/data/misc/update_engine_log" @@ -1785,6 +1786,10 @@ Dumpstate::RunStatus Dumpstate::dumpstate() { RunCommand("ACONFIG FLAGS", {PRINT_FLAGS}, CommandOptions::WithTimeout(10).Always().DropRoot().Build()); + RunCommand("ACONFIG FLAGS DUMP", {AFLAGS, "list"}, + 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"}); -- cgit v1.2.3-59-g8ed1b