Merge "dumpstate: dump logbuffer tcpm logs in bugreport"

This commit is contained in:
TreeHugger Robot 2021-09-03 05:58:53 +00:00 committed by Android (Google) Code Review
commit 22067f611c
2 changed files with 9 additions and 5 deletions

View file

@ -144,6 +144,7 @@ on init
chown system system /dev/logbuffer_rtx chown system system /dev/logbuffer_rtx
chown system system /dev/logbuffer_ssoc chown system system /dev/logbuffer_ssoc
chown system system /dev/logbuffer_ttf chown system system /dev/logbuffer_ttf
chown system system /dev/logbuffer_tcpm
chown system system /dev/logbuffer_usbpd chown system system /dev/logbuffer_usbpd
chown system system /dev/logbuffer_wireless chown system system /dev/logbuffer_wireless

View file

@ -337,11 +337,14 @@ void DumpstateDevice::dumpPowerSection(int fd) {
DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip"); DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip");
} }
if (!stat("/dev/logbuffer_tcpm", &buffer)) {
if (!stat("/sys/kernel/debug/tcpm", &buffer)) { DumpFileToFd(fd, "Logbuffer TCPM", "/dev/logbuffer_tcpm");
RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/tcpm/*"}); } else if (!PropertiesHelper::IsUserBuild()) {
} else { if (!stat("/sys/kernel/debug/tcpm", &buffer)) {
RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/usb/tcpm*"}); RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/tcpm/*"});
} else {
RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/usb/tcpm*"});
}
} }
DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd"); DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd");