From 0f2d1bd801f9acfbbc10b8c72bf386ff18e8d10e Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Tue, 16 Aug 2022 19:40:20 +0800 Subject: [PATCH 1/2] powerstats: add specific combination of data providers Bug: 242695004 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: Ibf689ae6a05a8b9f8c634d354bbcce6731825c0c Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 16 ++++++++++++++++ powerstats/include/Gs201CommonDataProviders.h | 1 + 2 files changed, 17 insertions(+) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 2d831291..0e00df71 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -680,6 +680,22 @@ void addGs201CommonDataProvidersQc(std::shared_ptr p) { addWlan(p); } +void addGs201CommonDataProvidersBig(std::shared_ptr p) { + setEnergyMeter(p); + + addAoC(p); + addDvfsStats(p); + addSoC(p); + addCPUclusters(p); + addGPU(p); + addUfs(p); + addPowerDomains(p); + addDevfreq(p); + addTPU(p); + addPixelStateResidencyDataProvider(p); + addWifi(p); +} + void addNFC(std::shared_ptr p, const std::string& path) { const GenericStateResidencyDataProvider::StateResidencyConfig nfcStateConfig = { .entryCountSupported = true, diff --git a/powerstats/include/Gs201CommonDataProviders.h b/powerstats/include/Gs201CommonDataProviders.h index 9fca9ba9..3f66637a 100644 --- a/powerstats/include/Gs201CommonDataProviders.h +++ b/powerstats/include/Gs201CommonDataProviders.h @@ -21,5 +21,6 @@ using aidl::android::hardware::power::stats::PowerStats; void addGs201CommonDataProviders(std::shared_ptr p); +void addGs201CommonDataProvidersBig(std::shared_ptr p); void addGs201CommonDataProvidersQc(std::shared_ptr p); void addNFC(std::shared_ptr p, const std::string& path); From 08c526a578df78a7956453a02c03802216394ed6 Mon Sep 17 00:00:00 2001 From: Wendly Li Date: Fri, 29 Jul 2022 11:23:57 +0000 Subject: [PATCH 2/2] dumpstate: Dump GTI touch information. Dump the touch information and rawdata when bugreport is triggered. Bug: 214118904 Test: adb bugreport Change-Id: I08834cf0176be69359264189b703486e33925f2b Signed-off-by: Wendly Li --- dumpstate/Dumpstate.cpp | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index cbdfb2cb..ddd2942b 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -528,6 +528,7 @@ void Dumpstate::dumpTouchSection(int fd) { const char lsi_spi_path[] = "/sys/devices/virtual/sec/tsp"; const char syna_cmd_path[] = "/sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs"; const char focaltech_cmd_path[] = "/proc/focaltech_touch"; + const char gti0_cmd_path[] = "/sys/devices/virtual/goog_touch_interface/gti.0"; char cmd[256]; if (!access(focaltech_cmd_path, R_OK)) { @@ -819,6 +820,48 @@ void Dumpstate::dumpTouchSection(int fd) { lsi_spi_path, lsi_spi_path); RunCommandToFd(fd, "Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); } + + if (!access(gti0_cmd_path, R_OK)) { + // Enable: force touch active + snprintf(cmd, sizeof(cmd), "echo 1 > %s/force_active", gti0_cmd_path); + RunCommandToFd(fd, "Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); + + // Touch Firmware Version + snprintf(cmd, sizeof(cmd), "%s/fw_ver", gti0_cmd_path); + DumpFileToFd(fd, "Touch Firmware Version", cmd); + + // Get Mutual Sensing Data - Baseline + snprintf(cmd, sizeof(cmd), "cat %s/ms_base", gti0_cmd_path); + RunCommandToFd(fd, "Get Mutual Sensing Data - Baseline", {"/vendor/bin/sh", "-c", cmd}); + + // Get Mutual Sensing Data - Delta + snprintf(cmd, sizeof(cmd), "cat %s/ms_diff", gti0_cmd_path); + RunCommandToFd(fd, "Get Mutual Sensing Data - Delta", {"/vendor/bin/sh", "-c", cmd}); + + // Get Mutual Sensing Data - Raw + snprintf(cmd, sizeof(cmd), "cat %s/ms_raw", gti0_cmd_path); + RunCommandToFd(fd, "Get Mutual Sensing Data - Raw", {"/vendor/bin/sh", "-c", cmd}); + + // Get Self Sensing Data - Baseline + snprintf(cmd, sizeof(cmd), "cat %s/ss_base", gti0_cmd_path); + RunCommandToFd(fd, "Get Self Sensing Data - Baseline", {"/vendor/bin/sh", "-c", cmd}); + + // Get Self Sensing Data - Delta + snprintf(cmd, sizeof(cmd), "cat %s/ss_diff", gti0_cmd_path); + RunCommandToFd(fd, "Get Self Sensing Data - Delta", {"/vendor/bin/sh", "-c", cmd}); + + // Get Self Sensing Data - Raw + snprintf(cmd, sizeof(cmd), "cat %s/ss_raw", gti0_cmd_path); + RunCommandToFd(fd, "Get Self Sensing Data - Raw", {"/vendor/bin/sh", "-c", cmd}); + + // Self Test + snprintf(cmd, sizeof(cmd), "cat %s/self_test", gti0_cmd_path); + RunCommandToFd(fd, "Self Test", {"/vendor/bin/sh", "-c", cmd}); + + // Disable: force touch active + snprintf(cmd, sizeof(cmd), "echo 0 > %s/force_active", gti0_cmd_path); + RunCommandToFd(fd, "Disable Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); + } } // Dump items related to SoC