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: I3cd1fe041b09e3bc0fc505c2ab1da73b8fea956a
Signed-off-by: Bill Richardson <wfrichar@google.com>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index c092d62..8f5a648 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -433,12 +433,10 @@
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);
