From ce7e06154061aadaa9505948d2d8777f2e5ab2cc Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Thu, 9 May 2024 06:48:24 +0200 Subject: [PATCH] sm7125-common: Use pixel power HAL directly * Samsung one is outdated and we didn't do any meaningful changes there Change-Id: I65378563396d12ee76e7f2b34105988c7e66cf38 --- common.mk | 5 ++--- rootdir/etc/init.samsung.rc | 2 +- rootdir/etc/init.target.rc | 2 ++ rootdir/etc/init.vendor.sensors.rc | 2 +- sepolicy/vendor/file_contexts | 2 +- vendor.prop | 3 +++ 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common.mk b/common.mk index ff7f900..57b8727 100644 --- a/common.mk +++ b/common.mk @@ -333,7 +333,7 @@ PRODUCT_COPY_FILES += \ # Power PRODUCT_PACKAGES += \ - android.hardware.power-service.samsung-libperfmgr \ + android.hardware.power-service.pixel-libperfmgr \ android.hardware.power@1.2.vendor PRODUCT_COPY_FILES += \ @@ -448,8 +448,7 @@ PRODUCT_SOONG_NAMESPACES += \ $(COMMON_PATH) \ hardware/google/interfaces \ hardware/google/pixel \ - hardware/samsung \ - hardware/samsung/aidl/power-libperfmgr + hardware/samsung # Prop files TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop diff --git a/rootdir/etc/init.samsung.rc b/rootdir/etc/init.samsung.rc index c6ed081..5fac735 100644 --- a/rootdir/etc/init.samsung.rc +++ b/rootdir/etc/init.samsung.rc @@ -171,7 +171,7 @@ on post-fs on boot # Permissions for Touchscreen - chown system radio /sys/class/sec/tsp/cmd + chown system system /sys/class/sec/tsp/cmd chown system system /sys/class/sec/tsp/input/enabled chmod 0660 /sys/class/sec/tsp/input/enabled chown system system /sys/class/sec/tsp/enabled diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index 474caa3..8c369f2 100644 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -154,6 +154,8 @@ on boot chown cameraserver cameraserver /dev/cpuset/camera-daemon/tasks chmod 0660 /dev/cpuset/camera-daemon/tasks + setprop vendor.powerhal.init 1 + #Load WLAN driver # exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ qca_cld3_wlan # exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki qca_cld3_wlan diff --git a/rootdir/etc/init.vendor.sensors.rc b/rootdir/etc/init.vendor.sensors.rc index 1a49489..692d0cd 100644 --- a/rootdir/etc/init.vendor.sensors.rc +++ b/rootdir/etc/init.vendor.sensors.rc @@ -177,7 +177,7 @@ on boot chown system radio /sys/class/sensors/light_sensor/read_copr chown system radio /sys/class/sensors/light_sensor/boled_enable chown system radio /sys/class/sensors/light_sensor/hallic_info - chown system radio /sys/class/sensors/light_sensor/lcd_onoff + chown system system /sys/class/sensors/light_sensor/lcd_onoff chown system radio /sys/class/sensors/light_sensor/sensorhub_ddi_spi_check chown system radio /sys/class/sensors/light_sensor/light_cal chown system radio /sys/class/sensors/light_sensor/set_aod_rect diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index be16c59..c6e64d4 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -53,7 +53,7 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@2\.5-service\.samsung u:object_r:hal_camera_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@[0-9]\.[0-9]-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@[0-9]\.[0-9]-service\.samsung u:object_r:hal_keymaster_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.samsung-libperfmgr u:object_r:hal_power_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.pixel-libperfmgr u:object_r:hal_power_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@[0-9]\.[0-9]-service\.samsung u:object_r:hal_nfc_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.fastcharge@[0-9]\.[0-9]-service\.samsung u:object_r:hal_lineage_fastcharge_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch\@[0-9]\.[0-9]-service.sm7125 u:object_r:hal_lineage_touch_default_exec:s0 diff --git a/vendor.prop b/vendor.prop index 32e62fd..391249f 100644 --- a/vendor.prop +++ b/vendor.prop @@ -175,6 +175,9 @@ debug.stagefright.ccodec=1 # Perf ro.vendor.extension_library=libqti-perfd-client.so +# Power HAL +vendor.powerhal.disp.idle_support=false + # RIL vendor.sec.rild.libpath=/vendor/lib64/libsec-ril.so persist.vendor.radio.atfwd.start=true