commit f6d61b844397acca58d8fa50289b4ef2402aef69
author Ted Bauer <tedbauer@google.com> Fri Sep 13 19:57:19 2024 +0000
committer Ted Bauer <tedbauer@google.com> Thu Sep 19 19:44:58 2024 +0000
tree e95b147e37f204aa9e005b4e128444a7874e26b7
parent 91a1058c26d91cbb83d5a5b8e9bb16db6f35afed

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

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 6576ffd..c407f48 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -170,6 +170,7 @@
 #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 @@
 
     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"});