From f5f9239424092da51f39c3c4bc382671e47d9eaf Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 13 Dec 2022 11:10:04 +0800 Subject: [PATCH 1/2] init: enable dock-defend by default dock-defend is enabled in kernel code. Bug: 262322247 Test: dock-defend is enabled by default Change-Id: Ibbd83fc2442e2a6d68d7f506ccd29d452947931c Signed-off-by: Jack Wu --- conf/init.gs101.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index d465d441..267a1815 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -310,9 +310,7 @@ on init chown system system /sys/devices/platform/google,cpm/dc_ctl # Important to include dd_state as it's used in battery defender in charger mode chown system system /sys/devices/platform/google,charger/dd_state - # Disable dock-defend by default chown system system /sys/devices/platform/google,charger/dd_settings - write /sys/devices/platform/google,charger/dd_settings -1 # Power Stats HAL chown system system /dev/bbd_pwrstat From 73e95ea0840e76143d471fb2fb74300d0307cba0 Mon Sep 17 00:00:00 2001 From: Wiwit Rifa'i Date: Mon, 12 Dec 2022 14:58:18 +0800 Subject: [PATCH 2/2] dumpstate: change HWC fence & error logs to be per display hwc_error_log.txt and hwc_fence_state.txt files will be changed to be per display. Those files could also be divided into at most 2 files, i.e. - hwc_error_log.txt will be renamed to {DisplayName}_hwc_error_log{index}.txt where {index} is 0 or 1. - hwc_fence_state.txt will be renamed to {DisplayName}_hwc_fence_state{index}.txt where {index} is 0 or 1. Bug: 245511651 Test: adb bugreport Change-Id: I08fbc4faf5fea72cbbca007f43ccedd22d1e0aca --- dumpstate/Dumpstate.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 9be29e84..40113256 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -590,8 +590,14 @@ void Dumpstate::dumpDisplaySection(int fd) { DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo"); if (!PropertiesHelper::IsUserBuild()) { - DumpFileToFd(fd, "HWC Fence State", "/data/vendor/log/hwc/hwc_fence_state.txt"); - DumpFileToFd(fd, "HWC Error Log", "/data/vendor/log/hwc/hwc_error_log.txt"); + RunCommandToFd(fd, "HWC Fence States", {"/vendor/bin/sh", "-c", + "for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt); do " + "echo $f ; cat $f ; done"}, + CommandOptions::WithTimeout(2).Build()); + RunCommandToFd(fd, "HWC Error Logs", {"/vendor/bin/sh", "-c", + "for f in $(ls /data/vendor/log/hwc/*_hwc_error_log*.txt); do " + "echo $f ; cat $f ; done"}, + CommandOptions::WithTimeout(2).Build()); RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c", "for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do " "echo $f ; cat $f ; done"},