From 0ac69fbfc021b1fa1dee81200cb9ecf296bed052 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 13 Dec 2022 11:16:49 +0800 Subject: [PATCH 1/3] init: enable dock-defend by default dock-defend is enabled in kernel code. Bug: 262322247 Test: dock-defend is enabled by default Change-Id: Ib7c7381f9d7d6d818e034911115e8c9045d5d0b6 Signed-off-by: Jack Wu --- conf/init.gs201.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index d1abd6d0..26078c2a 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -287,9 +287,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 63c4c328b1c5e5fe08a05cdb346541fde05e6386 Mon Sep 17 00:00:00 2001 From: Wiwit Rifa'i Date: Mon, 12 Dec 2022 15:42:13 +0800 Subject: [PATCH 2/3] 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: I8a7877095db9e9388c28f16644692e71c94a4a5b --- dumpstate/Dumpstate.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 066cf0c3..ea613ccc 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -590,8 +590,14 @@ void Dumpstate::dumpDisplaySection(int fd) { DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name"); 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"}, From 2292b4ed133d94e5646bfb087e53ac152326b77d Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Mon, 12 Dec 2022 11:38:53 -0800 Subject: [PATCH 3/3] FUSE-BPF: Enable the feature Bug: 202785178 Test: atest ScopedStorageDeviceTest atest CameraTest (one failure, with or without fuse bpf) audible app functions correctly call of duty and pubg start times are identical with feature on and off Change-Id: Id7f3186f2d05c91100401088f85b0830c8ad86af --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 4ccfaec7..343a0453 100644 --- a/device.mk +++ b/device.mk @@ -857,6 +857,10 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_PRODUCT_PROPERTIES += \ persist.sys.fuse.passthrough.enable=true +# Use FUSE BPF +PRODUCT_PRODUCT_PROPERTIES += \ + ro.fuse.bpf.enabled=true + # Use /product/etc/fstab.postinstall to mount system_other PRODUCT_PRODUCT_PROPERTIES += \ ro.postinstall.fstab.prefix=/product