From 40b3e768e48cd277eb0ef178c6eec82ce290302d Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Tue, 4 Oct 2022 14:32:19 +0800
Subject: [PATCH] move modem dump to gs-common

Bug: 250475732
Test: adb bugreport
Change-Id: Ifa227d7712c5d019db2e3a9d6fea118d054be601
---
 device.mk                     |  1 +
 dumpstate/DumpstateDevice.cpp | 14 --------------
 dumpstate/DumpstateDevice.h   |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/device.mk b/device.mk
index bf62879f..2c6bf660 100644
--- a/device.mk
+++ b/device.mk
@@ -18,6 +18,7 @@ include device/google/gs-common/device.mk
 include device/google/gs-common/gs_watchdogd/watchdog.mk
 include device/google/gs-common/ramdump/ramdump.mk
 include device/google/gs-common/soc/soc.mk
+include device/google/gs-common/modem/modem.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index d618e0a6..0c13943d 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -263,7 +263,6 @@ DumpstateDevice::DumpstateDevice()
         { "misc", [this](int fd) { dumpMiscSection(fd); } },
         { "camera", [this](int fd) { dumpCameraSection(fd); } },
         { "trusty", [this](int fd) { dumpTrustySection(fd); } },
-        { "modem", [this](int fd) { dumpModemSection(fd); } },
     } {
 }
 
@@ -979,19 +978,6 @@ void DumpstateDevice::dumpTrustySection(int fd) {
     DumpFileToFd(fd, "Trusty TEE0 Logs", "/dev/trusty-log0");
 }
 
-// Dump items related to modem
-void DumpstateDevice::dumpModemSection(int fd) {
-    DumpFileToFd(fd, "Modem Stat", "/data/vendor/modem_stat/debug.txt");
-    RunCommandToFd(fd, "Modem SSR history", {"/vendor/bin/sh", "-c",
-                       "for f in $(ls /data/vendor/ssrdump/crashinfo_modem*); do "
-                       "echo $f ; cat $f ; done"},
-                       CommandOptions::WithTimeout(2).Build());
-    RunCommandToFd(fd, "RFSD error log", {"/vendor/bin/sh", "-c",
-                       "for f in $(ls /data/vendor/log/rfsd/rfslog_*); do "
-                       "echo $f ; cat $f ; done"},
-                       CommandOptions::WithTimeout(2).Build());
-}
-
 static void *dumpModemThread(void *data) {
     std::string modemLogDir = MODEM_LOG_DIRECTORY;
     std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index 10a18f4c..db0779f4 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -75,7 +75,6 @@ struct DumpstateDevice : public IDumpstateDevice {
     void dumpMiscSection(int fd);
     void dumpCameraSection(int fd);
     void dumpTrustySection(int fd);
-    void dumpModemSection(int fd);
 };
 
 }  // namespace implementation