From eed4e341135842b92db3fd2c3584ba8a51e8dc69 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 7 Nov 2022 11:30:21 +0800 Subject: [PATCH 1/2] remove raven touch dump Bug: 256521567 Test: adb bugreport Change-Id: If7d45e4bb4c78101bf5221ee858cbea15ba6327d --- dumpstate/Dumpstate.cpp | 88 ----------------------------------------- 1 file changed, 88 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index bf4b8ac6..fce09695 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -546,7 +546,6 @@ void Dumpstate::dumpTouchSection(int fd) { "/proc/fts/driver_test", "/sys/class/spi_master/spi6/spi6.0", "/proc/fts_ext/driver_test"}; - 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"; @@ -755,93 +754,6 @@ void Dumpstate::dumpTouchSection(int fd) { } } - if (!access(lsi_spi_path, R_OK)) { - // Enable: force touch active - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "force_touch_active,1", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); - - // Firmware info - snprintf(cmd, sizeof(cmd), "%s/fw_version", lsi_spi_path); - DumpFileToFd(fd, "LSI firmware version", cmd); - - // Touch status - snprintf(cmd, sizeof(cmd), "%s/status", lsi_spi_path); - DumpFileToFd(fd, "LSI touch status", cmd); - - // Calibration info - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "get_mis_cal_info", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "Calibration info", {"/vendor/bin/sh", "-c", cmd}); - - // Mutual strength - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_delta_read_all", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "Mutual Strength", {"/vendor/bin/sh", "-c", cmd}); - - // Self strength - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_self_delta_read_all", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "Self Strength", {"/vendor/bin/sh", "-c", cmd}); - - // Raw cap - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_rawcap_read_all", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "Mutual Raw Cap", {"/vendor/bin/sh", "-c", cmd}); - - // Self raw cap - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_self_rawcap_read_all", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "Self Raw Cap", {"/vendor/bin/sh", "-c", cmd}); - - // TYPE_AMBIENT_DATA - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_rawdata_read_type,3", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "TYPE_AMBIENT_DATA", {"/vendor/bin/sh", "-c", cmd}); - - // TYPE_DECODED_DATA - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_rawdata_read_type,5", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "TYPE_DECODED_DATA", {"/vendor/bin/sh", "-c", cmd}); - - // TYPE_NOI_P2P_MIN - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_rawdata_read_type,30", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "TYPE_NOI_P2P_MIN", {"/vendor/bin/sh", "-c", cmd}); - - // TYPE_NOI_P2P_MAX - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "run_rawdata_read_type,31", - lsi_spi_path, lsi_spi_path); - RunCommandToFd(fd, "TYPE_NOI_P2P_MAX", {"/vendor/bin/sh", "-c", cmd}); - - // Disable: force touch active - snprintf(cmd, sizeof(cmd), - "echo %s > %s/cmd && cat %s/cmd_result", - "force_touch_active,0", - 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); From d0d71a7ce810683d17df144b64c8848412b6de79 Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 14 Nov 2022 10:14:16 -0800 Subject: [PATCH 2/2] battery_mitigation: Add BrownoutDetection app [DO NOT MERGE] This app files bugreport for user-debug build with reboot reason = ocp or uvlo. Removed the dependency on BetterBug. Bug: 237287659 Test: Ensure bugreport is generated under user-debug build with reboot reason = ocp or uvlo. Signed-off-by: George Lee Change-Id: I267f077e9c6c856b038b008397c0b465d209d9c3 --- battery_mitigation/battery_mitigation.rc | 56 ++++++++++++------------ device.mk | 3 +- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/battery_mitigation/battery_mitigation.rc b/battery_mitigation/battery_mitigation.rc index 4c4e2c1b..c0c76fb5 100644 --- a/battery_mitigation/battery_mitigation.rc +++ b/battery_mitigation/battery_mitigation.rc @@ -4,88 +4,88 @@ on property:vendor.thermal.link_ready=1 start vendor.battery_mitigation on property:ro.boot.bootreason=reboot,uvlo,pmic,if - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "uvlo,pmic,if" on property:ro.boot.bootreason=reboot,ocp,pmic,if - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,pmic,if" on property:ro.boot.bootreason=reboot,uvlo,pmic,main - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "uvlo,pmic,main" on property:ro.boot.bootreason=reboot,uvlo,pmic,sub - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "uvlo,pmic,sub" on property:ro.boot.bootreason=reboot,ocp,buck1m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck1m" on property:ro.boot.bootreason=reboot,ocp,buck2m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck2m" on property:ro.boot.bootreason=reboot,ocp,buck3m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck3m" on property:ro.boot.bootreason=reboot,ocp,buck4m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck4m" on property:ro.boot.bootreason=reboot,ocp,buck5m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck5m" on property:ro.boot.bootreason=reboot,ocp,buck6m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck6m" on property:ro.boot.bootreason=reboot,ocp,buck7m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck7m" on property:ro.boot.bootreason=reboot,ocp,buck8m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck8m" on property:ro.boot.bootreason=reboot,ocp,buck9m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck9m" on property:ro.boot.bootreason=reboot,ocp,buck10m - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck10m" on property:ro.boot.bootreason=reboot,ocp,buck1s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck1s" on property:ro.boot.bootreason=reboot,ocp,buck2s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck2s" on property:ro.boot.bootreason=reboot,ocp,buck3s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck3s" on property:ro.boot.bootreason=reboot,ocp,buck4s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck4s" on property:ro.boot.bootreason=reboot,ocp,buck5s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck5s" on property:ro.boot.bootreason=reboot,ocp,buck6s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck6s" on property:ro.boot.bootreason=reboot,ocp,buck7s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck7s" on property:ro.boot.bootreason=reboot,ocp,buck8s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck8s" on property:ro.boot.bootreason=reboot,ocp,buck9s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck9s" on property:ro.boot.bootreason=reboot,ocp,buck10s - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buck10s" on property:ro.boot.bootreason=reboot,ocp,buckds - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buckds" on property:ro.boot.bootreason=reboot,ocp,buckas - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buckas" on property:ro.boot.bootreason=reboot,ocp,buckcs - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buckcs" on property:ro.boot.bootreason=reboot,ocp,buckbs - setprop vendor.startup_bugreport_requested 1 + setprop vendor.brownout_reason "ocp,buckbs" service vendor.battery_mitigation /vendor/bin/hw/battery_mitigation user system diff --git a/device.mk b/device.mk index 4fb862d8..aa184c6f 100644 --- a/device.mk +++ b/device.mk @@ -551,7 +551,8 @@ PRODUCT_PACKAGES += \ # Battery Mitigation PRODUCT_PACKAGES += \ - battery_mitigation + battery_mitigation \ + BrownoutDetection PRODUCT_PACKAGES_DEBUG += \ sg_write_buffer \