dumpstate: Add missing items and clean up deprecated items

- Easel debug info
- power_supply properties
- Battery cycle count
- icnss stats access
- Fixed some glint errors

Bug: 72067726
Test: adb bugreport

Change-Id: I4592d437e74182d8a8967ec963aa03b93303ca15
Signed-off-by: Maggie White <maggiewhite@google.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 0b3fdb1..4bdb6ca 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -87,7 +87,7 @@ void DumpstateDevice::dumpDiagLogs(int fd, std::string srcDir, std::string destD
         std::string srcLogFile = srcDir + "/" + dirent_list[i]->d_name;
         std::string destLogFile = destDir + "/" + dirent_list[i]->d_name;
 
-        std::string copyCmd= "/vendor/bin/cp " + srcLogFile + " " + destLogFile;
+        std::string copyCmd = "/vendor/bin/cp " + srcLogFile + " " + destLogFile;
 
         ALOGD("Copying %s to %s\n", srcLogFile.c_str(), destLogFile.c_str());
         RunCommandToFd(fd, "CP DIAG LOGS", { "/vendor/bin/sh", "-c", copyCmd.c_str() }, options);
@@ -109,7 +109,6 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
     }
 
     if (!PropertiesHelper::IsUserBuild()) {
-
         CommandOptions options = CommandOptions::WithTimeout(120).Build();
 
         RunCommandToFd(fd, "MODEM RFS INFO",
@@ -210,7 +209,7 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
                 }
             }
 
-            std::string modemLogClearCmd= "/vendor/bin/rm -r " + modemLogAllDir;
+            std::string modemLogClearCmd = "/vendor/bin/rm -r " + modemLogAllDir;
             RunCommandToFd(fd, "RM MODEM DIR", { "/vendor/bin/sh", "-c", modemLogClearCmd.c_str()}, options);
             RunCommandToFd(fd, "RM LOG", { "/vendor/bin/rm", modemLogCombined.c_str()}, options);
         }
@@ -245,8 +244,7 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
 
     if (handle->numFds < 2) {
         ALOGE("no FD for modem\n");
-    }
-    else {
+    } else {
         int fdModem = handle->data[1];
         dumpModem(fd, fdModem);
     }
@@ -277,18 +275,20 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {
     RunCommandToFd(fd, "Cooling Device Current State", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; do type=`cat $f/type` ; temp=`cat $f/cur_state` ; echo \"$type: $temp\" ; done"});
     RunCommandToFd(fd, "CPU time-in-state", {"/vendor/bin/sh", "-c", "for cpu in /sys/devices/system/cpu/cpu*; do f=$cpu/cpufreq/stats/time_in_state; if [ ! -f $f ]; then continue; fi; echo $f:; cat $f; done"});
     RunCommandToFd(fd, "CPU cpuidle", {"/vendor/bin/sh", "-c", "for cpu in /sys/devices/system/cpu/cpu*; do for d in $cpu/cpuidle/state*; do if [ ! -d $d ]; then continue; fi; echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done; done"});
+    RunCommandToFd(fd, "Easel debug info", {"/vendor/bin/sh", "-c", "for f in `ls /sys/devices/platform/soc/a88000.i2c/i2c-0/0-0066/@(*curr|temperature|vbat|total_power)`; do echo \"$f: `cat $f`\" ; done; file=/sys/devices/virtual/misc/mnh_sm/state; echo \"$file: `cat $file`\""});
+    RunCommandToFd(fd, "Power supply properties", {"/vendor/bin/sh", "-c", "for f in `ls /sys/class/power_supply/*/uevent` ; do echo \"------ $f\\n`cat $f`\\n\" ; done"});
     DumpFileToFd(fd, "MDP xlogs", "/data/vendor/display/mdp_xlog");
     DumpFileToFd(fd, "TCPM logs", "/d/tcpm/usbpd0");
     DumpFileToFd(fd, "PD Engine", "/d/pd_engine/usbpd0");
-    DumpFileToFd(fd, "smblib-usb logs", "/d/ipc_logging/smblib/log");
     DumpFileToFd(fd, "ipc-local-ports", "/d/msm_ipc_router/dump_local_ports");
     DumpFileToFd(fd, "WLAN FW Log Symbol Table", "/vendor/firmware/Data.msc");
     DumpTouch(fd);
     RunCommandToFd(fd, "USB Device Descriptors", {"/vendor/bin/sh", "-c", "cd /sys/bus/usb/devices/1-1 && cat product && cat bcdDevice; cat descriptors | od -t x1 -w16 -N96"});
     RunCommandToFd(fd, "QSEE logs", {"/vendor/bin/sh", "-c", "cat /d/tzdbg/qsee_log"});
 
+    RunCommandToFd(fd, "Battery cycle count", {"/vendor/bin/sh", "-c", "for f in 1 2 3 4 5 6 7 8 ; do echo $f > /sys/class/power_supply/bms/cycle_count_id; count=`cat /sys/class/power_supply/bms/cycle_count`; echo \"$f: $count\"; done"});
     return Void();
-};
+}
 
 }  // namespace implementation
 }  // namespace V1_0