diff options
| -rw-r--r-- | device.mk | 1 | ||||
| -rw-r--r-- | dumpstate/Dumpstate.cpp | 21 | ||||
| -rw-r--r-- | dumpstate/Dumpstate.h | 1 |
3 files changed, 1 insertions, 22 deletions
@@ -29,6 +29,7 @@ include device/google/gs-common/soc/freq.mk include device/google/gs-common/gps/dump/log.mk include device/google/gs-common/display/dump.mk include device/google/gs-common/gxp/dump.mk +include device/google/gs-common/camera/dump.mk include device/google/zuma/dumpstate/item.mk diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 8b7d54f..ddf3de3 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -209,7 +209,6 @@ Dumpstate::Dumpstate() mLogSections{ { "modem", [this](int fd, const std::string &destDir) { dumpModemLogs(fd, destDir); } }, { "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } }, - { "camera", [this](int fd, const std::string &destDir) { dumpCameraLogs(fd, destDir); } }, } { } @@ -319,26 +318,6 @@ void Dumpstate::dumpRadioLogs(int fd, const std::string &destDir) { dumpNetmgrLogs(destDir); } -void Dumpstate::dumpCameraLogs(int fd, const std::string &destDir) { - bool cameraLogsEnabled = ::android::base::GetBoolProperty( - "vendor.camera.debug.camera_performance_analyzer.attach_to_bugreport", true); - if (!cameraLogsEnabled) { - return; - } - - static const std::string kCameraLogDir = "/data/vendor/camera/profiler"; - const std::string cameraDestDir = destDir + "/camera"; - - RunCommandToFd(fd, "MKDIR CAMERA LOG", {"/vendor/bin/mkdir", "-p", cameraDestDir.c_str()}, - CommandOptions::WithTimeout(2).Build()); - // Attach multiple latest sessions (in case the user is running concurrent - // sessions or starts a new session after the one with performance issues). - dumpLogs(fd, kCameraLogDir, cameraDestDir, 10, "session-ended-"); - dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "high-drop-rate-"); - dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "watchdog-"); - dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "camera-ended-"); -} - void Dumpstate::dumpLogSection(int fd, int fd_bin) { std::string logDir = MODEM_LOG_DIRECTORY; diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index 20ba4d0..c623856 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -59,7 +59,6 @@ class Dumpstate : public BnDumpstateDevice { // Log sections to be dumped individually into dumpstate_board.bin void dumpModemLogs(int fd, const std::string &destDir); void dumpRadioLogs(int fd, const std::string &destDir); - void dumpCameraLogs(int fd, const std::string &destDir); // Hybrid and binary sections that require an additional file descriptor void dumpRilLogs(int fd, std::string destDir); |