dumpstate: Include Citadel status in all bugreports

Gather Citadel's firmware version, uptime stats, and motherboard type in all
bug reports. None of this can be used to identify a specific phone, so it's
safe to run in production builds.

Previously we were running --id and --selftest. Because these could be used
to indentify a specific Citadel chip, we only gathered it on userdebug and
test builds. We used that to isolate problems with early Citadel samples in
prototype phones, which we've done, fixed, and replaced. We don't need that
info anymore.

Bug: 141235263
Test: manual
Change-Id: Ie8bbf818bca5bfda3905cbef9e103854dc0abaef
Signed-off-by: Bill Richardson <wfrichar@google.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 193dfb4..e4c5eb8 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -518,12 +518,10 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
         dumpModem(fd, fdModem);
     }
 
-    // Citadel info (only enabled on -eng and -userdebug builds)
-    if (!PropertiesHelper::IsUserBuild()) {
-        RunCommandToFd(fd, "Citadel ID", {"/vendor/bin/hw/citadel_updater", "--id"});
-        RunCommandToFd(fd, "Citadel VER", {"/vendor/bin/hw/citadel_updater", "-lv"});
-        RunCommandToFd(fd, "Citadel SELFTEST", {"/vendor/bin/hw/citadel_updater", "--selftest"});
-    }
+    // Citadel info
+    RunCommandToFd(fd, "Citadel VERSION", {"/vendor/bin/hw/citadel_updater", "-lv"});
+    RunCommandToFd(fd, "Citadel STATS", {"/vendor/bin/hw/citadel_updater", "--stats"});
+    RunCommandToFd(fd, "Citadel BOARDID", {"/vendor/bin/hw/citadel_updater", "--board_id"});
 
     DumpVibrator(fd);