From cec76c9796dc7d4febb8e6e1943ae95708f29bcd Mon Sep 17 00:00:00 2001 From: David Wronek Date: Sun, 12 Jan 2025 20:34:15 +0100 Subject: [PATCH] e3q: Fix camera Change-Id: If6c242499680e9fb57b4c3417b851858314cd3db --- .../com.samsung.permission.SSENSOR.xml | 15 --------- ...ssion.HRM_EXT.xml => platform-samsung.xml} | 10 +++++- configs/vintf/device_framework_matrix.xml | 8 ----- device.mk | 3 +- extract-files.py | 3 +- libshims/Android.bp | 11 +++++++ libshims/libhypervintf/libhypervintf.cpp | 32 +++++++++++++++++++ proprietary-files.txt | 17 +++++----- rootdir/etc/init.e3q.rc | 9 ++++++ rootdir/etc/init.samsung.rc | 8 ----- 10 files changed, 71 insertions(+), 45 deletions(-) delete mode 100644 configs/permissions/com.samsung.permission.SSENSOR.xml rename configs/permissions/{com.samsung.permission.HRM_EXT.xml => platform-samsung.xml} (63%) create mode 100644 libshims/Android.bp create mode 100644 libshims/libhypervintf/libhypervintf.cpp diff --git a/configs/permissions/com.samsung.permission.SSENSOR.xml b/configs/permissions/com.samsung.permission.SSENSOR.xml deleted file mode 100644 index 7180684..0000000 --- a/configs/permissions/com.samsung.permission.SSENSOR.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/configs/permissions/com.samsung.permission.HRM_EXT.xml b/configs/permissions/platform-samsung.xml similarity index 63% rename from configs/permissions/com.samsung.permission.HRM_EXT.xml rename to configs/permissions/platform-samsung.xml index 515edfe..c88c33c 100644 --- a/configs/permissions/com.samsung.permission.HRM_EXT.xml +++ b/configs/permissions/platform-samsung.xml @@ -1,5 +1,5 @@ - + + + diff --git a/configs/vintf/device_framework_matrix.xml b/configs/vintf/device_framework_matrix.xml index 60c5f3f..7540082 100644 --- a/configs/vintf/device_framework_matrix.xml +++ b/configs/vintf/device_framework_matrix.xml @@ -1,12 +1,4 @@ - - vendor.samsung.hardware.hyper - 2 - - ISehHyPer - default - - vendor.samsung.hardware.authfw diff --git a/device.mk b/device.mk index 4e3331a..cfb826a 100644 --- a/device.mk +++ b/device.mk @@ -107,8 +107,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \ - $(LOCAL_PATH)/configs/permissions/com.samsung.permission.HRM_EXT.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.samsung.permission.HRM_EXT.xml \ - $(LOCAL_PATH)/configs/permissions/com.samsung.permission.SSENSOR.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.samsung.permission.SSENSOR.xml + $(LOCAL_PATH)/configs/permissions/platform-samsung.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/platform-samsung.xml # DebugFS PRODUCT_SET_DEBUGFS_RESTRICTIONS := true diff --git a/extract-files.py b/extract-files.py index 0934330..5248363 100755 --- a/extract-files.py +++ b/extract-files.py @@ -42,8 +42,7 @@ def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs): lib_fixups: lib_fixups_user_type = { **lib_fixups, ( - 'libsecril-client', - 'libhyper' + 'libsecril-client' ): lib_fixup_vendor_suffix, ( 'libagmclient', diff --git a/libshims/Android.bp b/libshims/Android.bp new file mode 100644 index 0000000..cf490b5 --- /dev/null +++ b/libshims/Android.bp @@ -0,0 +1,11 @@ +// +// Copyright (C) 2024 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +cc_library_shared { + name: "libhypervintf", + srcs: ["libhypervintf/libhypervintf.cpp"], + vendor: true, +} diff --git a/libshims/libhypervintf/libhypervintf.cpp b/libshims/libhypervintf/libhypervintf.cpp new file mode 100644 index 0000000..68c2d41 --- /dev/null +++ b/libshims/libhypervintf/libhypervintf.cpp @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 The LineageOS Project + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +struct HyPerToken { +}; + +void hyper_getNewHyPerToken(void) { +} + +void hyper_setTokenProcName(HyPerToken*, std::string) { +} + +void hyper_checkResourceExist(int) { +} + +void hyper_acquire(HyPerToken, std::vector) { +} + +void hyper_setProcName(std::string) { +} + +void hyper_getSupportedFrequency(int, int) { +} + +void hyper_release(HyPerToken) { +} diff --git a/proprietary-files.txt b/proprietary-files.txt index 9a151e0..d34763c 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -31,6 +31,9 @@ vendor/lib64/rfs/dsp/libqsegnetengine_dsp_skel.so:vendor/lib/rfsa/adsp/libqsegne vendor/lib64/rfs/dsp/libscveT2T_skel.so:vendor/lib/rfsa/adsp/libscveT2T_skel.so;SYMLINK=vendor/lib64/rfs/dsp/libscveT2T_skel.so vendor/lib64/rfs/dsp/libworker_pool.so:vendor/lib/rfsa/adsp/libworker_pool.so vendor/lib64/rfs/dsp/snap/libQnnHtpV75Skel.so:vendor/lib/rfsa/adsp/snap/libQnnHtpV75Skel.so;SYMLINK=vendor/lib64/rfs/dsp/snap/libQnnHtpV75Skel.so +vendor/lib64/snap/libQnnHtp.so +vendor/lib64/snap/libQnnHtpV75Stub.so +vendor/lib64/snap/libQnnSystem.so # Audio vendor/etc/LVACFS_Calibration.dat @@ -65,6 +68,7 @@ vendor/lib64/libcapiv2svacnnvendor.so vendor/lib64/libcapiv2svarnnvendor.so vendor/lib64/libcapiv2udk7vendor.so vendor/lib64/libcapiv2uvvendor.so +vendor/lib64/libcustomva_intf.so vendor/lib64/libdsd2pcm.so vendor/lib64/liblistensoundmodel2vendor.so vendor/lib64/liblx-ar_util.so @@ -526,6 +530,7 @@ vendor/lib64/libfocuspeaking.so vendor/lib64/libfocuspeaking.uniplugin@1.0.so vendor/lib64/libformatConverter.unifunc.so vendor/lib64/libgaya.so +vendor/lib64/libgralloc_helper.unifunc.so vendor/lib64/libhand_interaction.uniplugin@1.0.so vendor/lib64/libhandgesture.arcsoft.so vendor/lib64/libhdr10plus.so @@ -1169,6 +1174,7 @@ vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.s vendor/lib64/egl/libq3dtools_esx.so vendor/lib64/libCB.so vendor/lib64/libOpenCL.so +vendor/lib64/libOpenCL_adreno.so vendor/lib64/libadreno_app_profiles.so vendor/lib64/libadreno_utils.so vendor/lib64/libgpudataproducer.so @@ -1198,15 +1204,7 @@ vendor/bin/hw/vendor.samsung.hardware.health-service vendor/etc/init/vendor.samsung.hardware.health-service.rc vendor/lib64/vendor.samsung.hardware.health-V1-ndk.so -# Hyper -vendor/bin/hw/vendor.samsung.hardware.hyper-service -vendor/etc/hyper/config_chipset.json -vendor/etc/hyper/config_hyper_permission.json -vendor/etc/hyper/config_vendor.json -vendor/etc/init/hyper-default-sec.rc -vendor/etc/vintf/manifest/hyper-default-sec.xml -vendor/lib64/libhyper.so;MODULE_SUFFIX=_vendor -vendor/lib64/libhypervintf.so +# HyPer vendor/lib64/vendor.samsung.hardware.hyper-V2-ndk.so # Media @@ -1216,6 +1214,7 @@ vendor/bin/hw/samsung.software.media.c2@1.0-service vendor/bin/hw/vendor.qti.media.c2@1.0-service vendor/bin/init.qti.media.sh vendor/etc/init/init.qti.media.rc +vendor/etc/init/samsung.software.media.c2@1.0-service.rc vendor/etc/init/vendor.qti.media.c2@1.0-service.rc vendor/etc/media_codecs.xml vendor/etc/media_codecs_performance_pineapple.xml diff --git a/rootdir/etc/init.e3q.rc b/rootdir/etc/init.e3q.rc index 95a02b9..588d220 100644 --- a/rootdir/etc/init.e3q.rc +++ b/rootdir/etc/init.e3q.rc @@ -79,6 +79,15 @@ on boot chown system radio /sys/class/sensors/range_sensor/file_p2p chown system radio /sys/class/sensors/range_sensor/file_shape # ] Permissions for Range Sensor + + # mem_boost_mode + chmod 0664 /sys/kernel/mm/vmscan/mem_boost_mode + chown cameraserver system /sys/kernel/mm/vmscan/mem_boost_mode + + # rbin mem_boost_mode + chmod 0664 /sys/kernel/rbin/mem_boost_mode + chown cameraserver system /sys/kernel/rbin/mem_boost_mode + on shutdown # service definition diff --git a/rootdir/etc/init.samsung.rc b/rootdir/etc/init.samsung.rc index 3dc864a..f301066 100644 --- a/rootdir/etc/init.samsung.rc +++ b/rootdir/etc/init.samsung.rc @@ -114,11 +114,3 @@ service factory_ssc /vendor/bin/factory.ssc on property:sys.boot_completed=1 setprop ro.factory.sensor.delay.init 1 - -on property:sys.dexopt.ctrl=true - setprop dalvik.vm.dex2oat-cpu-set "0,1,5,6" - setprop dalvik.vm.dex2oat-threads 4 - -on property:sys.dexopt.ctrl=false - setprop dalvik.vm.dex2oat-cpu-set "" - set_dex2oat_threads ctrl