From b578bc8a0ea02c8d286b48ffe0ccb7a1dba2523d Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Mon, 20 Mar 2023 11:09:26 +0800
Subject: [PATCH] use gs-common camera dump

Bug: 273380509
Test: adb bugreport
Change-Id: I1312a62bd65ec8804bb967d98d1f231f6798b5c3
---
 device.mk               |  1 +
 dumpstate/Dumpstate.cpp | 21 ---------------------
 dumpstate/Dumpstate.h   |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/device.mk b/device.mk
index 1aec2251..8c6eb25d 100644
--- a/device.mk
+++ b/device.mk
@@ -25,6 +25,7 @@ include device/google/gs-common/thermal/thermal.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
 include device/google/gs-common/performance/perf.mk
 include device/google/gs-common/display/dump.mk
+include device/google/gs-common/camera/dump.mk
 include device/google/gs-common/umfw_stat/umfw_stat.mk
 
 TARGET_BOARD_PLATFORM := gs201
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 6869d2e8..99d752ca 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -198,7 +198,6 @@ Dumpstate::Dumpstate()
     },
   mLogSections{
         { "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } },
-        { "camera", [this](int fd, const std::string &destDir) { dumpCameraLogs(fd, destDir); } },
         { "gps", [this](int fd, const std::string &destDir) { dumpGpsLogs(fd, destDir); } },
         { "gxp", [this](int fd, const std::string &destDir) { dumpGxpLogs(fd, destDir); } },
   } {
@@ -503,26 +502,6 @@ void Dumpstate::dumpGpsLogs(int fd, const std::string &destDir) {
     dumpLogs(fd, gpsLogDir, gpsDestDir, maxFileNum, GPS_LOG_PREFIX);
 }
 
-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::dumpGxpLogs(int fd, const std::string &destDir) {
     bool gxpDumpEnabled = ::android::base::GetBoolProperty("vendor.gxp.attach_to_bugreport", false);
 
diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h
index 6c349703..18d2b5a9 100644
--- a/dumpstate/Dumpstate.h
+++ b/dumpstate/Dumpstate.h
@@ -60,7 +60,6 @@ class Dumpstate : public BnDumpstateDevice {
 
     // Log sections to be dumped individually into dumpstate_board.bin
     void dumpRadioLogs(int fd, const std::string &destDir);
-    void dumpCameraLogs(int fd, const std::string &destDir);
     void dumpGpsLogs(int fd, const std::string &destDir);
     void dumpGxpLogs(int fd, const std::string &destDir);