Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "move camera dump to gs-common" into udc-dev am: 608ff36086

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21692922

Change-Id: I9eacac14d0a02ddd70c11fede4afa04dff6cef64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Shih 2023-03-07 00:03:59 +00:00 • committed by Automerger Merge Worker
commit cd1d455111
3 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
device.mk
View file

@ -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/gps/dump/log.mk
include device/google/gs-common/display/dump.mk include device/google/gs-common/display/dump.mk
include device/google/gs-common/gxp/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 include device/google/zuma/dumpstate/item.mk

21
dumpstate/Dumpstate.cpp
View file

@ -193,7 +193,6 @@ Dumpstate::Dumpstate()
}, },
mLogSections{ mLogSections{
{ "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } }, { "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } },
{ "camera", [this](int fd, const std::string &destDir) { dumpCameraLogs(fd, destDir); } },
} { } {
} }
@ -275,26 +274,6 @@ void Dumpstate::dumpRadioLogs(int fd, const std::string &destDir) {
dumpNetmgrLogs(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) void Dumpstate::dumpLogSection(int fd, int fd_bin)
{ {
std::string logDir = MODEM_LOG_DIRECTORY; std::string logDir = MODEM_LOG_DIRECTORY;

1
dumpstate/Dumpstate.h
View file

@ -58,7 +58,6 @@ class Dumpstate : public BnDumpstateDevice {
// Log sections to be dumped individually into dumpstate_board.bin // Log sections to be dumped individually into dumpstate_board.bin
void dumpRadioLogs(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 // Hybrid and binary sections that require an additional file descriptor
void dumpRilLogs(int fd, std::string destDir); void dumpRilLogs(int fd, std::string destDir);