From ef2932e0c82725dbc52e51104d22f2b54f32ac9d Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Fri, 2 Dec 2022 20:05:06 +0100 Subject: [PATCH] sm7125-common: A525FXXU4CVJB Change-Id: I91a4787c205194035a33d2ce51993a368debd96a --- BoardConfigCommon.mk | 2 +- common.mk | 3 +- configs/audio/audio_effects.xml | 2 ++ configs/media/media_codecs.xml | 1 + proprietary-files.txt | 12 +++++--- rootdir/Android.mk | 8 ----- rootdir/etc/init.samsung.rc | 51 ++++++++++++++++++++++++++++---- rootdir/etc/init.vendor.sysfw.rc | 17 ----------- rootdir/etc/wifi_sec.rc | 9 ++++++ 9 files changed, 68 insertions(+), 37 deletions(-) delete mode 100644 rootdir/etc/init.vendor.sysfw.rc diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e6b8a4f..09abb44 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -182,7 +182,7 @@ TARGET_USES_ION := true TARGET_DISABLED_UBWC := true # Security patch -VENDOR_SECURITY_PATCH := 2022-07-01 +VENDOR_SECURITY_PATCH := 2022-11-01 # FM BOARD_HAS_QCA_FM_SOC := cherokee diff --git a/common.mk b/common.mk index fdf18bc..5ff0d1b 100644 --- a/common.mk +++ b/common.mk @@ -55,8 +55,7 @@ PRODUCT_PACKAGES += \ init.vendor.onebinary.rc \ init.vendor.rilchip.rc \ init.vendor.rilcommon.rc \ - init.vendor.sensors.rc \ - init.vendor.sysfw.rc + init.vendor.sensors.rc # Vendor scripts PRODUCT_PACKAGES += \ diff --git a/configs/audio/audio_effects.xml b/configs/audio/audio_effects.xml index 1e83989..e079733 100644 --- a/configs/audio/audio_effects.xml +++ b/configs/audio/audio_effects.xml @@ -42,6 +42,7 @@ + @@ -90,6 +91,7 @@ + diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml index 0bc37ce..5eccc24 100644 --- a/configs/media/media_codecs.xml +++ b/configs/media/media_codecs.xml @@ -214,6 +214,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/proprietary-files.txt b/proprietary-files.txt index 68e9795..cd616c9 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All blobs are from A525FXXU4BVG1, unless pinned +# All blobs are from A525FXXU4CVJB (T), unless pinned # ACDB vendor/lib/libacdb-fts.so @@ -83,6 +83,10 @@ vendor/lib/libsurround_3mic_proc.so vendor/lib/libdrc.so vendor/lib/libspkrprot.so vendor/lib/libprofileparamstorage.so +vendor/lib/libspatializerparamstorage.so +vendor/lib64/libspatializerparamstorage.so +vendor/lib/spatializer-aidl-V1-cpp.so +vendor/lib64/spatializer-aidl-V1-cpp.so # Soundtrigger vendor/lib/hw/sound_trigger.primary.atoll.so @@ -106,11 +110,13 @@ vendor/lib/soundfx/libqcreverb.so vendor/lib/soundfx/libshoebox.so vendor/lib/soundfx/libqcbassboost.so vendor/lib/soundfx/libswdap.so +vendor/lib/soundfx/libswspatializer.so vendor/lib64/soundfx/libqcvirt.so vendor/lib64/soundfx/libasphere.so vendor/lib64/soundfx/libqcreverb.so vendor/lib64/soundfx/libshoebox.so vendor/lib64/soundfx/libqcbassboost.so +vendor/lib64/soundfx/libswspatializer.so vendor/etc/dolby/dax-default.xml # Audio Firmware @@ -726,7 +732,7 @@ vendor/bin/hw/android.hardware.health@2.1-service-samsung vendor/etc/init/android.hardware.health@2.1-service-samsung.rc -vendor/etc/vintf/manifest/android.hardware.health@2.1-samsung.xml vendor/lib/hw/android.hardware.health@2.0-impl-2.1-samsung.so -vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so|8e7c50b855276f6158d6dac82a5e9192b6ca4d09 +vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so|ca16e2899855991b3131a6fbfce8fecbedbd21b6 vendor/lib/vendor.samsung.hardware.health@2.0.so vendor/lib64/vendor.samsung.hardware.health@2.0.so @@ -1072,9 +1078,7 @@ vendor/etc/init/vendor.samsung.hardware.thermal@1.0-service.rc -vendor/etc/vintf/manifest/vendor.samsung.hardware.thermal@1.0-manifest.xml vendor/lib/vendor.samsung.hardware.thermal@1.0.so vendor/lib64/vendor.samsung.hardware.thermal@1.0.so -vendor/lib/libhypervintf.so vendor/lib64/libhypervintf.so -vendor/lib/vendor.samsung.hardware.hyper-V2-ndk_platform.so vendor/lib64/vendor.samsung.hardware.hyper-V2-ndk_platform.so # Time services diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 68589b4..180cc25 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -148,14 +148,6 @@ LOCAL_SRC_FILES := etc/init.vendor.sensors.rc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.vendor.sysfw.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.vendor.sysfw.rc -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := wifi_sec.rc LOCAL_MODULE_TAGS := optional diff --git a/rootdir/etc/init.samsung.rc b/rootdir/etc/init.samsung.rc index c59bd79..2c95277 100644 --- a/rootdir/etc/init.samsung.rc +++ b/rootdir/etc/init.samsung.rc @@ -38,11 +38,15 @@ on early-init mkdir /efs/taas 0770 system system mkdir /mnt/vendor/efs/taas 0770 system system chown system system /dev/tspio - chown system system /sys/class/sec/tsp/enabled - chmod 0660 /sys/class/sec/tsp/enabled chown system system /dev/tsp_data + chown system system /sys/class/sec/tsp/input/enabled + chown system system /sys/class/sec/tsp1/input/enabled + chown system system /sys/class/sec/tsp2/input/enabled + chown system system /sys/class/sec/sec_epen/input/enabled + chown system system /sys/class/sec/tsp/enabled + chown system system /sys/class/sec/tsp1/enabled + chown system system /sys/class/sec/tsp2/enabled chown system system /sys/class/sec/sec_epen/enabled - chmod 0660 /sys/class/sec/sec_epen/enabled # pogo keyboard chown system system /sys/class/sec/sec_keypad/fw_update @@ -53,6 +57,8 @@ on init chown system radio /sys/class/sec/switch/afc_disable +on early-boot + # Vibrator chown system system /sys/class/timed_output/vibrator/intensity chown system system /sys/class/timed_output/vibrator/force_touch_intensity @@ -70,6 +76,7 @@ on init chown system system /sys/class/timed_output/vibrator/haptic_intensities chown system system /sys/class/timed_output/vibrator/fifo chown system system /sys/class/timed_output/vibrator/hybrid_haptic_engine + chown system system /sys/class/timed_output/vibrator/use_sep_index chown system system /sys/class/leds/vibrator/intensity chown system system /sys/class/leds/vibrator/force_touch_intensity @@ -88,6 +95,8 @@ on init chown system system /sys/class/leds/vibrator/fifo chown system system /sys/class/leds/vibrator/hybrid_haptic_engine + chown system system /sys/class/sec_vib_inputff/control/use_sep_index + chmod 660 /sys/class/timed_output/vibrator/intensity chmod 660 /sys/class/timed_output/vibrator/force_touch_intensity chmod 660 /sys/class/timed_output/vibrator/multi_freq @@ -190,11 +199,14 @@ on boot chown system system /sys/class/sec/tsp/ta_mode chown system system /sys/class/sec/tsp/virtual_prox chown system system /sys/class/sec/tsp/hw_param + chown system system /sys/class/sec/tsp/input/trusted_touch_enable + chown system system /sys/class/sec/tsp/input/trusted_touch_event + chown system system /sys/class/sec/tsp/input/trusted_touch_type # Permissions for Touchscreen-1 chown system radio /sys/class/sec/tsp1/cmd chown system system /sys/class/sec/tsp1/input/enabled - chmod 0660 /sys/class/sec/tsp/input1/enabled + chmod 0660 /sys/class/sec/tsp1/input/enabled chown system system /sys/class/sec/tsp1/multi_count chown system system /sys/class/sec/tsp1/wet_mode chown system system /sys/class/sec/tsp1/noise_mode @@ -210,7 +222,7 @@ on boot # Permissions for Touchscreen-2 chown system radio /sys/class/sec/tsp2/cmd chown system system /sys/class/sec/tsp2/input/enabled - chmod 0660 /sys/class/sec/tsp/input2/enabled + chmod 0660 /sys/class/sec/tsp2/input/enabled chown system system /sys/class/sec/tsp2/multi_count chown system system /sys/class/sec/tsp2/wet_mode chown system system /sys/class/sec/tsp2/noise_mode @@ -227,6 +239,8 @@ on boot chown system radio /sys/class/sec/sec_epen/cmd chown system system /sys/class/sec/sec_epen/input/enabled chmod 0660 /sys/class/sec/sec_epen/input/enabled + chown system system /sys/class/sec/sec_epen/enabled + chmod 0660 /sys/class/sec/sec_epen/enabled chown system radio /sys/class/sec/sec_epen/epen_firm_update chown system radio /sys/class/sec/sec_epen/epen_reset chown system radio /sys/class/sec/sec_epen/epen_reset_result @@ -250,6 +264,9 @@ on boot # Permission for Securetouch chown system system /sys/class/sec/ss_touch/secure/secure_touch_enable + chown system system /sys/class/sec/ss_touch/secure/trusted_touch_enable + chown system system /sys/class/sec/ss_touch/secure/trusted_touch_event + chown system system /sys/class/sec/ss_touch/secure/trusted_touch_type chown system system /sys/class/sec/tsp/input/secure_touch_enable chown system system /sys/class/sec/tsp1/input/secure_touch_enable chown system system /sys/class/sec/tsp2/input/secure_touch_enable @@ -265,6 +282,10 @@ on boot chown system system /sys/class/sec/sec_sidekey/input/enabled chmod 0660 /sys/class/sec/sec_sidekey/input/enabled + # Permission for Keyboard + chown system system /sys/class/sec/sec_keypad/enabled + chmod 0660 /sys/class/sec/sec_keypad/enabled + # TAAS chown system system /mnt/vendor/efs/taas chown system system /mnt/vendor/efs/taas/taas @@ -493,6 +514,26 @@ on boot chmod 0664 /sys/class/devfreq/soc:qcom,cpu6-cpu-ddr-latfloor/min_freq chmod 0664 /sys/class/devfreq/soc:qcom,cpu6-cpu-ddr-latfloor/max_freq +# enabled permission +on property:sys.boot_completed=1 + chown system system /sys/class/sec/tsp/input/enabled + chown system system /sys/class/sec/tsp1/input/enabled + chown system system /sys/class/sec/tsp2/input/enabled + chown system system /sys/class/sec/sec_epen/input/enabled + chown system system /sys/class/sec/tsp/enabled + chown system system /sys/class/sec/tsp1/enabled + chown system system /sys/class/sec/tsp2/enabled + chown system system /sys/class/sec/sec_epen/enabled + chown system system /sys/class/sec/tsp/input/trusted_touch_enable + chown system system /sys/class/sec/tsp/input/trusted_touch_event + chown system system /sys/class/sec/tsp/input/trusted_touch_type + chown system system /sys/class/sec/tsp1/input/trusted_touch_enable + chown system system /sys/class/sec/tsp1/input/trusted_touch_event + chown system system /sys/class/sec/tsp1/input/trusted_touch_type + chown system system /sys/class/sec/tsp2/input/trusted_touch_enable + chown system system /sys/class/sec/tsp2/input/trusted_touch_event + chown system system /sys/class/sec/tsp2/input/trusted_touch_type + # FINGERPRINT FRAMEWORK : starts goodixfingerprintd service goodixd /vendor/bin/goodixfingerprintd class late_start diff --git a/rootdir/etc/init.vendor.sysfw.rc b/rootdir/etc/init.vendor.sysfw.rc deleted file mode 100644 index 8fd375e..0000000 --- a/rootdir/etc/init.vendor.sysfw.rc +++ /dev/null @@ -1,17 +0,0 @@ -on post-fs - # make fsdbg on /dev for filesystem debug info. - mkdir /dev/fsdbg 0775 root system - -on boot - # FSDBG dlog permissions - chown root system /proc/fslog/dlog_efs - chown root system /proc/fslog/dlog_etc - chown root system /proc/fslog/dlog_mm - chown root system /proc/fslog/dlog_rmdir - - # Permissions for Filesystem - # change owner f2fs bigdata node for hqm write - chown system system /sys/fs/f2fs/userdata/sec_gc_stat - chown system system /sys/fs/f2fs/userdata/sec_io_stat - chown system system /sys/fs/f2fs/userdata/sec_fsck_stat - chown system system /sys/fs/f2fs/userdata/sec_defrag_stat diff --git a/rootdir/etc/wifi_sec.rc b/rootdir/etc/wifi_sec.rc index 584abe0..0bf42ff 100644 --- a/rootdir/etc/wifi_sec.rc +++ b/rootdir/etc/wifi_sec.rc @@ -30,6 +30,12 @@ on post-fs-data chown system wifi /vendor/etc/wifi/indoorchannel.info chmod 0664 /vendor/etc/wifi/indoorchannel.info + # for updating the supported feature + chown wifi wifi /data/vendor/conn/.feature.info + chmod 0640 /data/vendor/conn/.feature.info + chown wifi wifi /sys/wifi/feature + chmod 0640 /sys/wifi/feature + # for WIFI MAC mkdir /mnt/vendor/efs/wifi 0755 wifi wifi chown wifi wifi /mnt/vendor/efs/wifi/.mac.info @@ -42,6 +48,8 @@ on post-fs-data chown wifi wifi /sys/wifi/dump_in_progress chmod 0660 /sys/wifi/dump_in_progress + start macloader + on boot setprop wifi.interface wlan0 @@ -59,6 +67,7 @@ service macloader /vendor/bin/hw/macloader user wifi group wifi inet net_raw net_admin capabilities NET_ADMIN NET_RAW SYS_MODULE + disabled oneshot service wlandutservice /system/bin/wlandutservice