gts4lv-common: Update all the things to R

* Declare support for low latency audio * Reenable TARGET_USES_ALIGNED_YCBCR_HEIGHT flag since Samsung camera blobs require that again (yikes!) * Regenerate config.fs file using config-fs-gen from lineage scripts repo * Require Android 11 FW * Update vendor security patch date * Update PRODUCT_PACKAGES according to changes in vintf manifest/blobs * Sync audio/media/wifi/other configs with stock * Sync vendor.prop with stock * Align sepolicy with changes in blobs Change-Id: I4461309730a34af975302737ae091b53edc2f79c
2021-04-09 16:27:25 +01:00
parent 57b7b46d77
commit de98277c56
26 changed files with 451 additions and 616 deletions
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -89,6 +89,7 @@ TARGET_ENABLE_MEDIADRM_64 := true
 TARGET_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
 TARGET_USES_ION := true
+TARGET_USES_ALIGNED_YCBCR_HEIGHT := true
 TARGET_USES_YCRCB_CAMERA_PREVIEW := true

 MAX_EGL_CACHE_KEY_SIZE := 12*1024
@@ -166,7 +167,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)
 BOARD_ROOT_EXTRA_FOLDERS := efs

 # Security Patch Level
-VENDOR_SECURITY_PATCH := 2021-02-01
+VENDOR_SECURITY_PATCH := 2021-03-01

 # SELinux
 include device/qcom/sepolicy_vndr/SEPolicy.mk
--- a/audio/configs/audio_platform_info.xml
+++ b/audio/configs/audio_platform_info.xml
@@ -43,6 +43,7 @@
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" acdb_id="10"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" acdb_id="10"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="45"/>
+        <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>
        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="35"/>
        <device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>
        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>
@@ -56,6 +57,7 @@
        <device name="SND_DEVICE_IN_EC_REF_LOOPBACK_MONO" acdb_id="140"/>
        <device name="SND_DEVICE_IN_EC_REF_LOOPBACK_STEREO" acdb_id="140"/>
        <device name="SND_DEVICE_IN_EC_REF_LOOPBACK_QUAD" acdb_id="140"/>
+        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="34"/>
    </acdb_ids>
    <backend_names>
        <!-- System S/W Team Guide                                                      -->
@@ -136,7 +138,6 @@

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="INT0_MI2S_RX"/>
-        <device name="SND_DEVICE_OUT_HEADSET_AFE_LISTENBACK" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_CALL_HEADSET" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_CALL_HEADSET_EVS" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_WIFI_CALL_HEADSET" backend="headphones" interface="INT0_MI2S_RX"/>
@@ -154,6 +155,8 @@
        <device name="SND_DEVICE_OUT_FM_HEADSET" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_HEADSET_KARAOKE" backend="headphones" interface="INT0_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_HEADPHONES_KARAOKE" backend="headphones" interface="INT0_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_HEADPHONES_AFE_LISTENBACK" backend="headphones" interface="INT0_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_HEADSET_AFE_LISTENBACK" backend="headset" interface="INT0_MI2S_RX"/>

        <device name="SND_DEVICE_OUT_HEADPHONES_DSD" backend="headphones-dsd" interface=""/>

--- a/audio/configs/mixer_paths.xml
+++ b/audio/configs/mixer_paths.xml
@@ -147,6 +147,7 @@

    <ctl name="SEC_TDM_RX_0 Format" value="S24_LE" />
    <ctl name="SEC_TDM_TX_0 Format" value="S24_LE" />
+    <ctl name="SEC_TDM SlotNumber" value="Four" />

    <ctl name="Voice Rx Device Mute" id="0" value="0" />
    <ctl name="Voice Rx Device Mute" id="1" value="-1" />
--- a/board-info.txt
+++ b/board-info.txt
@@ -1 +1 @@
-require version-trustzone=XF.5.0.2-00155|XF.5.0.2-315709-9
+require version-trustzone=XF.5.0.2-00229
--- a/config.fs
+++ b/config.fs
@@ -16,6 +16,15 @@ value:2905
 [AID_VENDOR_QRTR]
 value:2906

+[AID_VENDOR_THERMAL]
+value:2907
+
+[AID_VENDOR_FASTRPC]
+value:2908
+
+[AID_VENDOR_QTR]
+value:2909
+
 [AID_VENDOR_SEND_HELP_MSG]
 value:5003

@@ -76,6 +85,9 @@ value:5386
 [AID_VENDOR_AUDIT]
 value:5555

+[AID_VENDOR_SYSTEM_RESERVED_STORAGE]
+value:5678
+
 [bt_firmware/]
 mode: 0771
 user: AID_SYSTEM
@@ -214,6 +226,12 @@ user: AID_RADIO
 group: AID_RADIO
 caps: NET_BIND_SERVICE

+[vendor/bin/imsdaemon]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE WAKE_ALARM BLOCK_SUSPEND
+
 [vendor/bin/imsdatadaemon]
 mode: 0755
 user: AID_RADIO
--- a/configs/privapp-permissions-hotword.xml
+++ b/configs/privapp-permissions-hotword.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
-        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
    </privapp-permissions>

    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
-        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
    </privapp-permissions>
 </permissions>
--- a/configs/public.libraries.txt
+++ b/configs/public.libraries.txt
@@ -1,28 +1,8 @@
-libDLInterface.camera.samsung.so
-libImageTagger.camera.samsung.so
 libOpenCL.so
-libSNPE.so
-libSceneDetector_v1.camera.samsung.so
 libadsprpc.so
-libaix.so
-libc++_shared.so
 libcdsprpc.so
 libfastcvopt.so
-libget_icd.so
-libhumantracking_util.camera.samsung.so
-libnpu.so
 libqti-perfd-client.so
 libsdsprpc.so
-libsmart_cropping.camera.samsung.so
-libsnap_caffe.so
-libsnap_caffe_wrapper.so
-libsnap_compute.so
-libsnap_compute_wrapper.so
-libsnap_vndk.so
-libsnpe_dsp_domains_v2.so
-libsnpe_dsp_v65_domains_v2_skel.so
-libsnpe_wrapper.so
-libsymphony-cpu.so
-libsymphonypower.so
 libprotobuf-cpp-full.so
 libprotobuf-cpp-lite.so
--- a/gts4lv.mk
+++ b/gts4lv.mk
@@ -116,9 +116,7 @@ PRODUCT_PACKAGES += \
    init.samsung.rc \
    init.samsung.bsp.rc \
    init.target.rc \
-    ueventd.qcom.rc \
-    wifi_qcom.rc \
-    wifi_sec.rc
+    ueventd.qcom.rc

 # Display
 PRODUCT_PACKAGES += \
@@ -133,7 +131,8 @@ PRODUCT_PACKAGES += \
    memtrack.sdm710 \
    vendor.display.config@1.0.vendor \
    vendor.display.config@2.0 \
-    vendor.qti.hardware.display.allocator@1.0-service
+    vendor.qti.hardware.display.allocator@1.0-service \
+    vendor.qti.hardware.display.mapper@3.0.vendor

 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
    ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \
@@ -187,7 +186,8 @@ PRODUCT_COPY_FILES += \

 # Keymaster
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@4.0-service.samsung
+    android.hardware.keymaster@4.0-service.samsung \
+    libkeymaster4_1support.vendor:64

 # Media
 PRODUCT_COPY_FILES += \
@@ -205,8 +205,8 @@ PRODUCT_COPY_FILES += \

 PRODUCT_PACKAGES += \
    libavservices_minijail \
+    libavservices_minijail.vendor \
    libc2dcolorconvert \
-    libgui_vendor \
    libOmxAacEnc \
    libOmxAmrEnc \
    libOmxCore \
@@ -215,12 +215,12 @@ PRODUCT_PACKAGES += \
    libOmxQcelp13Enc \
    libOmxVdec \
    libOmxVenc \
-    libOmxVidcCommon \
    libstagefrighthw

 # Permissions
 PRODUCT_COPY_FILES += \
    external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml \
+    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
    frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
    frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
    frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml \
@@ -254,7 +254,9 @@ PRODUCT_COPY_FILES += \
 # Power
 PRODUCT_PACKAGES += \
    android.hardware.power-service-qti \
-    vendor.qti.hardware.perf@2.0.vendor
+    vendor.qti.hardware.perf@2.0.vendor \
+    vendor.qti.hardware.perf@2.1.vendor \
+    vendor.qti.hardware.perf@2.2.vendor

 # Protobuf
 PRODUCT_PACKAGES += \
@@ -284,8 +286,7 @@ PRODUCT_COPY_FILES += \

 # Sensors
 PRODUCT_PACKAGES += \
-    android.hardware.sensors@1.0-impl:64 \
-    android.hardware.sensors@1.0-service
+    android.hardware.sensors@2.0-service.multihal

 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
--- a/manifest.xml
+++ b/manifest.xml
@@ -74,8 +74,6 @@
            <name>IDrmFactory</name>
            <instance>default</instance>
        </interface>
-        <fqname>@1.2::ICryptoFactory/widevine</fqname>
-        <fqname>@1.2::IDrmFactory/widevine</fqname>
        <fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
        <fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
    </hal>
@@ -88,16 +86,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IGnss</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IGnss/gnss_vendor</fqname>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.graphics.allocator</name>
        <transport>hwbinder</transport>
@@ -125,16 +113,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-            <instance>sehhealth</instance>
-        </interface>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.keymaster</name>
        <transport>hwbinder</transport>
@@ -175,17 +153,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>qti-default</instance>
-            <instance>qti-dsp</instance>
-            <instance>qti-gpu</instance>
-        </interface>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.renderscript</name>
        <transport arch="32+64">passthrough</transport>
@@ -195,15 +162,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
    <hal format="hidl">
        <name>android.hardware.soundtrigger</name>
        <transport>hwbinder</transport>
@@ -262,24 +220,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.gnss</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ILocHidlGnss</name>
-            <instance>gnss_vendor</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.gnss</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ILocHidlGnss</name>
-            <instance>gnss_vendor</instance>
-        </interface>
-    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.capabilityconfigstore</name>
        <transport>hwbinder</transport>
@@ -289,10 +229,19 @@
            <instance>default</instance>
        </interface>
    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.dsp</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IDspService</name>
+            <instance>dspservice</instance>
+        </interface>
+    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.perf</name>
        <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>2.2</version>
        <interface>
            <name>IPerf</name>
            <instance>default</instance>
@@ -307,15 +256,6 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl">
-        <name>vendor.qti.hardware.soter</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISoter</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
    <hal format="hidl">
        <name>vendor.qti.hardware.tui_comm</name>
        <transport>hwbinder</transport>
@@ -373,13 +313,4 @@
            <instance>default</instance>
        </interface>
    </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISehHealth</name>
-            <instance>sehhealth</instance>
-        </interface>
-    </hal>
 </manifest>
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,19 +1,16 @@
-# Common proprietary files - from Samsung package version T720XXS2CUA3, unless pinned
+# Common proprietary files - from Samsung package version T720XXU2DUD7, unless pinned

 # ADSP
 vendor/bin/adsprpcd
+vendor/etc/init/vendor.qti.adsprpc-sscrpc-service.rc
 vendor/lib/libadsp_default_listener.so
 vendor/lib/libadsprpc.so
 vendor/lib64/libadsp_default_listener.so
 vendor/lib64/libadsprpc.so

 # ANT+
-lib/com.qualcomm.qti.ant@1.0.so
-lib/libantradio.so
-lib64/com.qualcomm.qti.ant@1.0.so
-lib64/libantradio.so
-vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so
-vendor/lib/com.qualcomm.qti.ant@1.0.so
+-system/lib64/libantradio.so
+system_ext/lib64/com.qualcomm.qti.ant@1.0.so
 vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
 vendor/lib64/com.qualcomm.qti.ant@1.0.so

@@ -35,7 +32,7 @@ vendor/lib64/libaudcal.so
 vendor/lib64/libaudioalsa.so
 vendor/lib64/libqtigef.so

-# Audio - Effects
+# Audio FX modules
 vendor/lib/soundfx/libasphere.so
 vendor/lib/soundfx/libqcbassboost.so
 vendor/lib/soundfx/libqcreverb.so
@@ -47,24 +44,28 @@ vendor/lib64/soundfx/libqcreverb.so
 vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libshoebox.so

-# Audio - Speaker Firmware
+# Audio (amplifier firmware)
 vendor/firmware/cs35l41-dsp1-spk-prot.bin
 vendor/firmware/cs35l41-dsp1-spk-prot-calib.bin
 vendor/firmware/cs35l41-dsp1-spk-prot.wmfw

+# Audio (sound card firmware)
+vendor/firmware/dbmd8_va_asrp_fw.bin
+vendor/firmware/dbmd8_va_fw.bin
+
 # Bluetooth
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
-vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
-vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so
 vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
+vendor/lib64/vendor.qti.hardware.fm@1.0.so
 vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so
+vendor/lib64/libbtnv.so

-# Bluetooth (aptX) - from crosshatch - QP1A.190711.020
-product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
+# Bluetooth (aptX)
+system/lib64/libaptX_encoder.so:system_ext/lib64/libaptX_encoder.so

-# Bluetooth - Firmware
+# Bluetooth (firmware)
 vendor/firmware/apbtfw11.tlv
 vendor/firmware/apnv11.bin
 vendor/firmware/crbtfw21.tlv
@@ -113,14 +114,13 @@ vendor/lib/camera.device@3.3-impl.so
 vendor/lib/camera.device@3.4-impl.so
 vendor/lib/com.qti.node.eisv2.so
 vendor/lib/com.qti.node.eisv3.so
-vendor/lib/libcamera_nn_stub.so
 vendor/lib/libcamxfdalgov7.so
 vendor/lib/libcamxfdengine.so
 vendor/lib/libcamxstatscore.so
+vendor/lib/libcamxtintlessalgo.so
 vendor/lib/libcamxswprocessalgo.so
 vendor/lib/libcom.qti.chinodeutils.so
 vendor/lib/libchiss3alogdebug.so
-vendor/lib/libDLInterface.camera.samsung.so
 vendor/lib/libdualcam_optical_zoom_control.so
 vendor/lib/libhigh_dynamic_range.so
 vendor/lib/libhypermotion_core.so
@@ -137,7 +137,6 @@ vendor/lib/libuniapi.so
 vendor/lib/libuniplugin.so
 vendor/lib/libvdis_core.so
 vendor/lib/libvdis_interface.so
-vendor/lib/libxcv.camera.samsung.so

 # Camera - Firmware
 vendor/firmware/CAMERA_ICP.elf
@@ -149,57 +148,60 @@ vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so
 vendor/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so

 # Device Health
-vendor/bin/hw/android.hardware.health@2.0-service.samsung
-vendor/etc/init/android.hardware.health@2.0-service.samsung.rc
-vendor/lib64/vendor.samsung.hardware.health@1.0.so
+vendor/bin/hw/android.hardware.health@2.1-service-samsung
+-vendor/etc/vintf/manifest/android.hardware.health@2.1-samsung.xml
+vendor/etc/init/android.hardware.health@2.1-service-samsung.rc
+vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so
+vendor/lib64/vendor.samsung.hardware.health@2.0.so

-# Display (HDR) - from PNX - RKQ1.200906.002
-vendor/lib/libhdr_tm.so|1e8a647523db0a09c9587a77f1f7b132a03c2354
-vendor/lib64/libhdr_tm.so|7ac38563480eab0583cb440e667a44cfa596167a
+# Display (HDR)
+vendor/lib/libhdr_tm.so
+vendor/lib64/libhdr_tm.so

-# Display (SDM) - from PNX - RKQ1.200906.002
-vendor/lib/libdisplayqos.so|7b83c36716bae758c71d34b85401d7d77afa2c23
-vendor/lib/libqseed3.so|ea8d3775ab13c9ebfcdc2a02e60f56cc49a9d695
-vendor/lib/libsdedrm.so|b11f16f16cdeaecb492b7ff2274cc02bd604bf0f
-vendor/lib/libsdm-color.so|a18425c4e29bf76f25145d8f839108886283a45f
-vendor/lib/libsdm-diag.so|52c1b843b733165284445b00cb8525063994f502
-vendor/lib/libsdm-disp-vndapis.so|8f433d5996f90c584530ed5a6eba504c3b4cc2b1
-vendor/lib/libsdmextension.so|872876273741968fda9006853979d9da1accc4fb
-vendor/lib/libtinyxml2_1.so|f00b8f6218271d57fd1fb67b192db956e42e66fb
-vendor/lib64/libdisplayqos.so|c3d45315871e402053dd1f353e9bde5cbf757277
-vendor/lib64/libqseed3.so|f5990f19a99ec5f33b5a262493c4e642a1429f69
-vendor/lib64/libsdedrm.so|5113b02d32b886281a790c8c323498195ec780f8
-vendor/lib64/libsdm-color.so|a2b413dea186f9049cb596a6414efc2739694059
-vendor/lib64/libsdm-diag.so|f484f554a015327acf7b5d1f8dbcdddf083c2f45
-vendor/lib64/libsdm-disp-vndapis.so|4c6916fed1e304effa4c06c7207fb0e1b604f3ae
-vendor/lib64/libsdmextension.so|70c18b044897825bc1f15f2b6f73b64b639b6d40
-vendor/lib64/libtinyxml2_1.so|92101861d95cbdf9625d192d0b2295baa5960b68
+# Display (SDM)
+vendor/lib/libdisplayqos.so
+vendor/lib/libqseed3.so
+vendor/lib/libsdedrm.so
+vendor/lib/libsdm-color.so
+vendor/lib/libsdm-diag.so
+vendor/lib/libsdm-disp-vndapis.so
+vendor/lib/libsdmextension.so
+vendor/lib/libtinyxml2_1.so
+vendor/lib64/libdisplayqos.so
+vendor/lib64/libqseed3.so
+vendor/lib64/libsdedrm.so
+vendor/lib64/libsdm-color.so
+vendor/lib64/libsdm-diag.so
+vendor/lib64/libsdm-disp-vndapis.so
+vendor/lib64/libsdmextension.so
+vendor/lib64/libtinyxml2_1.so

-# Display postprocessing - from PNX - RKQ1.200906.002
-vendor/bin/hw/vendor.display.color@1.0-service|a9d360976833d863f74df381298de696daea8acb
-vendor/bin/mm-pp-dpps|e825298dc12603df29c35aa6ad86fd0d0a7646a2
-vendor/bin/ppd|8b60669c32f091dd5832579892c91dc3eb0e8130
-vendor/etc/init/vendor.display.color@1.0-service.rc|5ad673f879b3685a0e79b5633437e5499cb94f48
-vendor/lib/libdisp-aba.so|9271ecfa4d389d99bc592ab2a460eacef7515836
-vendor/lib/vendor.display.color@1.0.so|640ab2b9c2f0077634ed74263c5558076d431203
-vendor/lib/vendor.display.color@1.1.so|732531bbea59f5c1a90f409350d290607189c47f
-vendor/lib/vendor.display.color@1.2.so|f1ea074c629f1fc27000efb44617f7e8386b12d4
-vendor/lib/vendor.display.color@1.3.so|1467fbb9cbbb331da846fd2bcc3e644b55723bd5
-vendor/lib/vendor.display.color@1.4.so|3b7f6a489f66b2cc8b3e5a467b9fe3f95a59c775
-vendor/lib/vendor.display.color@1.5.so|e97e31b9567f9a6f9031063d2356e7391ba719e3
-vendor/lib/vendor.display.postproc@1.0.so|251c33b11743f5e24ca220b220da367996f3077b
-vendor/lib64/libdisp-aba.so|e76d6756cbb0532bc83ff98a06c4ca02fecdd8fe
-vendor/lib64/vendor.display.color@1.0.so|253cd210899ea79133c7b7b9d31429e4a8d43c32
-vendor/lib64/vendor.display.color@1.1.so|fe9b373785571bb890db27523b804dc7d4411bca
-vendor/lib64/vendor.display.color@1.2.so|f40eb8c9d39776c43448431d7c7f7ecc3e4506c3
-vendor/lib64/vendor.display.color@1.3.so|3fbe0a8a317789608848f35b39ed9bfb734f9ecc
-vendor/lib64/vendor.display.color@1.4.so|1396673668977af0a8afeaa64f891c3b356f958d
-vendor/lib64/vendor.display.color@1.5.so|f1c12eb133698917385d48913358eaffd9a10879
-vendor/lib64/vendor.display.postproc@1.0.so|e56b66d744dd77bd87afbb30cab558acf15709fb
+# Display postprocessing
+vendor/bin/hw/vendor.display.color@1.0-service
+vendor/bin/mm-pp-dpps
+vendor/bin/ppd
+vendor/etc/init/vendor.display.color@1.0-service.rc
+vendor/lib/libdisp-aba.so
+vendor/lib/vendor.display.color@1.0.so
+vendor/lib/vendor.display.color@1.1.so
+vendor/lib/vendor.display.color@1.2.so
+vendor/lib/vendor.display.color@1.3.so
+vendor/lib/vendor.display.color@1.4.so
+vendor/lib/vendor.display.color@1.5.so
+vendor/lib/vendor.display.postproc@1.0.so
+vendor/lib64/libdisp-aba.so
+vendor/lib64/vendor.display.color@1.0.so
+vendor/lib64/vendor.display.color@1.1.so
+vendor/lib64/vendor.display.color@1.2.so
+vendor/lib64/vendor.display.color@1.3.so
+vendor/lib64/vendor.display.color@1.4.so
+vendor/lib64/vendor.display.color@1.5.so
+vendor/lib64/vendor.display.postproc@1.0.so

 # DRM
-vendor/bin/hw/android.hardware.drm@1.2-service.widevine
-vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc
+vendor/bin/hw/android.hardware.drm@1.3-service.widevine
+vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
+-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
 vendor/lib/mediadrm/libwvdrmengine.so
 vendor/lib/libcpion.so
 vendor/lib/libhdcpsrm.so
@@ -208,16 +210,18 @@ vendor/lib/libwvhidl.so

 # DSP
 vendor/bin/cdsprpcd
+vendor/bin/dspservice
+vendor/etc/init/vendor.qti.cdsprpc-service.rc
+vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc
+vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
 vendor/lib/rfsa/adsp/libapps_mem_heap.so
 vendor/lib/rfsa/adsp/libcamera_nn_skel.so
-vendor/lib/rfsa/adsp/libcvpdsp_skel.so
 vendor/lib/rfsa/adsp/libdspCV_skel.so
 vendor/lib/rfsa/adsp/libfastcvadsp.so
 vendor/lib/rfsa/adsp/libfastcvdsp_skel.so
-vendor/lib/rfsa/adsp/libhexagon_nn_skel.so
-vendor/lib/rfsa/adsp/libscveBlobDescriptor_skel.so
 vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so
 vendor/lib/rfsa/adsp/libscveT2T_skel.so
+vendor/lib/rfsa/adsp/libsnpe_dsp_v65_domains_v2_skel.so
 vendor/lib/rfsa/adsp/libsns_device_mode_skel.so
 vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so
 vendor/lib/rfsa/adsp/libVC1DecDsp_skel.so
@@ -230,6 +234,7 @@ vendor/lib/libfastcvopt.so
 vendor/lib/libmdsprpc.so
 vendor/lib/libsdsprpc.so
 vendor/lib/libsysmon_cdsp_skel.so
+vendor/lib/vendor.qti.hardware.dsp@1.0.so
 vendor/lib64/libcdsp_default_listener.so
 vendor/lib64/libcdsprpc.so
 vendor/lib64/libfastcvdsp_stub.so
@@ -237,6 +242,7 @@ vendor/lib64/libfastcvopt.so
 vendor/lib64/libmdsprpc.so
 vendor/lib64/libsdsprpc.so
 vendor/lib64/libsysmon_cdsp_skel.so
+vendor/lib64/vendor.qti.hardware.dsp@1.0.so

 # Fingerprint
 vendor/lib/libbauthserver.so
@@ -252,42 +258,28 @@ vendor/lib64/libgf_in_system_lib.so
 vendor/lib64/libqfp_sensortest.so
 vendor/lib64/libsynaFpSensorTestNwd.so

-# Firmware
-vendor/firmware/Data.msc
-vendor/firmware/dbmd8_va_asrp_fw.bin
-vendor/firmware/dbmd8_va_fw.bin
-vendor/firmware/leia_pfp_470.fw
-vendor/firmware/leia_pm4_470.fw
-
-# FM
-vendor/lib/ftm_fm_lib.so
-vendor/lib/vendor.qti.hardware.fm@1.0.so
-vendor/lib64/ftm_fm_lib.so
-vendor/lib64/vendor.qti.hardware.fm@1.0.so
-
 # Gatekeeper
 vendor/etc/init/android.hardware.gatekeeper@1.0-service.rc
 vendor/lib64/hw/gatekeeper.mdfpp.so

-# GPS
-vendor/bin/hw/android.hardware.gnss@2.0-service-qti
-vendor/etc/init/android.hardware.gnss@2.0-service-qti.rc
-vendor/etc/vintf/manifest/android.hardware.gnss@2.0-service-qti.xml
-vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml
+# GNSS
+vendor/bin/hw/android.hardware.gnss@2.1-service-qti
+vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc
+-vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
 vendor/bin/loc_launcher
 vendor/bin/lowi-server
 vendor/bin/xtra-daemon
-vendor/etc/cacert_location.pem
 vendor/etc/flp.conf
 vendor/etc/gps.conf
+vendor/etc/gnss_antenna_info.conf
 vendor/etc/izat.conf
 vendor/etc/lowi.conf
 vendor/etc/sap.conf
-vendor/etc/xtra_root_cert.pem
-vendor/lib/hw/android.hardware.gnss@2.0-impl-qti.so
-vendor/lib/hw/vendor.qti.gnss@3.0-impl.so
+vendor/lib/hw/android.hardware.gnss@2.1-impl-qti.so
 vendor/lib/hw/vendor.samsung.hardware.gnss@2.0-impl-sec.so
 vendor/lib/libbatching.so
+vendor/lib/libcdfw_remote_api.so
+vendor/lib/libcdfw.so
 vendor/lib/libdataitems.so
 vendor/lib/libfloatingfeature.so
 vendor/lib/libgeofencing.so
@@ -298,26 +290,30 @@ vendor/lib/libizat_client_api.so
 vendor/lib/libizat_core.so
 vendor/lib/liblbs_core.so
 vendor/lib/libloc_api_v02.so
+vendor/lib/libloc_core.so
+vendor/lib/libloc_socket.so
 vendor/lib/liblocation_api.so
 vendor/lib/liblocationservice_glue.so
 vendor/lib/liblocationservice.so
-vendor/lib/libloc_core.so
 vendor/lib/liblowi_client.so
-vendor/lib/liblowi_wifihal.so
 vendor/lib/libpdmapper.so
-vendor/lib/libxtadapter.so
+vendor/lib/libqcc_file_agent.so
+vendor/lib/libsemnativecarrierfeature.so
+vendor/lib/libsynergy_loc_api.so
 vendor/lib/vendor.qti.gnss@1.0.so
 vendor/lib/vendor.qti.gnss@1.1.so
 vendor/lib/vendor.qti.gnss@1.2.so
 vendor/lib/vendor.qti.gnss@2.0.so
 vendor/lib/vendor.qti.gnss@2.1.so
-vendor/lib/vendor.qti.gnss@3.0-service.so
 vendor/lib/vendor.qti.gnss@3.0.so
+vendor/lib/vendor.qti.gnss@4.0.so
+vendor/lib/vendor.qti.hardware.qccsyshal@1.0.so
 vendor/lib/vendor.samsung.hardware.gnss@2.0.so
-vendor/lib64/hw/android.hardware.gnss@2.0-impl-qti.so
-vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so
+vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
 vendor/lib64/hw/vendor.samsung.hardware.gnss@2.0-impl-sec.so
 vendor/lib64/libbatching.so
+vendor/lib64/libcdfw_remote_api.so
+vendor/lib64/libcdfw.so
 vendor/lib64/libdataitems.so
 vendor/lib64/libfloatingfeature.so
 vendor/lib64/libgeofencing.so
@@ -328,99 +324,82 @@ vendor/lib64/libizat_client_api.so
 vendor/lib64/libizat_core.so
 vendor/lib64/liblbs_core.so
 vendor/lib64/libloc_api_v02.so
+vendor/lib64/libloc_core.so
+vendor/lib64/libloc_socket.so
 vendor/lib64/liblocation_api.so
 vendor/lib64/liblocationservice_glue.so
 vendor/lib64/liblocationservice.so
-vendor/lib64/libloc_core.so
 vendor/lib64/liblowi_client.so
-vendor/lib64/liblowi_wifihal.so
 vendor/lib64/libpdmapper.so
+vendor/lib64/libqcc_file_agent.so
 vendor/lib64/libqdma_file_agent.so
-vendor/lib64/libxtadapter.so
+vendor/lib64/libsemnativecarrierfeature.so
+vendor/lib64/libsynergy_loc_api.so
 vendor/lib64/vendor.qti.gnss@1.0.so
 vendor/lib64/vendor.qti.gnss@1.1.so
 vendor/lib64/vendor.qti.gnss@1.2.so
 vendor/lib64/vendor.qti.gnss@2.0.so
 vendor/lib64/vendor.qti.gnss@2.1.so
-vendor/lib64/vendor.qti.gnss@3.0-service.so
 vendor/lib64/vendor.qti.gnss@3.0.so
+vendor/lib64/vendor.qti.gnss@4.0.so
+vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so
 vendor/lib64/vendor.samsung.hardware.gnss@2.0.so

-# Graphics (Adreno) - from PNX - RKQ1.200906.002
-vendor/lib/egl/eglSubDriverAndroid.so|cc5acc02889131a29b624b4c19ab90b8273f393d
-vendor/lib/egl/libEGL_adreno.so|ae30bbf20dc911308407da99cb263e8de6b2eecb
-vendor/lib/egl/libGLESv1_CM_adreno.so|b94ba8188a14dd262abac1b8d667bce3319cf344
-vendor/lib/egl/libGLESv2_adreno.so|fc0454b2c9d9997f9b7f0b320482fac6db5cab2c
-vendor/lib/egl/libq3dtools_adreno.so|2ac81ee05dd4afb34ef6e56342ee1757f2db1409
-vendor/lib/egl/libq3dtools_esx.so|86bab4e474d680accbc76582c9905fe6824f702d
-vendor/lib/libC2D2.so|267be7bd6768fa3b9bed2b9a42062cb5a77ca59b
-vendor/lib/libCB.so|c4c8fbcb73a48aa1dc14a453b47ed7f1223bb933
-vendor/lib/libOpenCL.so|cbc00e31eedea81f43cc7358181a794503b867b1
-vendor/lib/libVkLayer_q3dtools.so|a52a6eba8415169a5895b4615f879f966f81d5e2
-vendor/lib/libadreno_utils.so|0796bc7ce75dbad3d85e52d3aacd4ba8b59fbaf3
-vendor/lib/libc2d30_bltlib.so|950c705e6dbc02b646a0129e66e94e192f5cd87f
-vendor/lib/libgpudataproducer.so|c8623c9b2e8f330e7f5e77e5d435677719bf5688
-vendor/lib/libgsl.so|777dab024670cceb8c60054cfadcccef33151640
-vendor/lib/libllvm-glnext.so|a20bdbe458c401e9c1726f475f50fb52f9f6fa12
-vendor/lib/libllvm-qcom.so|063963a7d6dfa90c6fa2cbca55943b23a870e02a
-vendor/lib/libpvr.so|9d7e50e1deb16ef03e05141e1babcc49160f840c
-vendor/lib64/egl/eglSubDriverAndroid.so|cd1cb25bfd16f15e0d7c6495493359838a1b6e96
-vendor/lib64/egl/libEGL_adreno.so|96a44c8e3c18c534eb1f333956541955e9f5bd7e
-vendor/lib64/egl/libGLESv1_CM_adreno.so|e2e8a079e680bf92f686fb79146651c158f6e130
-vendor/lib64/egl/libGLESv2_adreno.so|ba9e5618266e50a4d2ef723756e08979e0b4d12b
-vendor/lib64/egl/libq3dtools_adreno.so|046be35d03cbea2c73a1339eefa1bffc87ab6ebc
-vendor/lib64/egl/libq3dtools_esx.so|fe5b3f2dabe3b927544d109ac7d7926d8e3275d6
-vendor/lib64/libC2D2.so|6fb775e393ce7161b30e3a71fa0f320e86374425
-vendor/lib64/libCB.so|bfb47fec90627dd68df536dbb4734453ebae1cf6
-vendor/lib64/libOpenCL.so|4eefe5848a02894166a337abbbc5baddb72c46fb
-vendor/lib64/libVkLayer_q3dtools.so|4fc15fd2c49e32b2151fb00034d389d45cf240c1
-vendor/lib64/libadreno_utils.so|010d7079615cf09413640521ed2db53e91721437
-vendor/lib64/libc2d30_bltlib.so|aa37c84cf6cc1e1ac670b433c97d0bf41308f9ca
-vendor/lib64/libgpudataproducer.so|7d3c8de131f4d64a8ec82840e097f78f8b9ce004
-vendor/lib64/libgsl.so|edcab73069716f117394de07be423331631f9366
-vendor/lib64/libllvm-glnext.so|c11e3f0f5b6d21d1badcca3bc8cac947c781deeb
-vendor/lib64/libllvm-qcom.so|a80c58c8f316af15a7a2d089536f824836f6c056
-vendor/lib64/libpvr.so|ac4805ba7a7c78570a60340d01248d258046e456
+# Graphics (Adreno)
+vendor/lib/egl/eglSubDriverAndroid.so
+vendor/lib/egl/libEGL_adreno.so
+vendor/lib/egl/libGLESv1_CM_adreno.so
+vendor/lib/egl/libGLESv2_adreno.so
+vendor/lib/egl/libq3dtools_adreno.so
+vendor/lib/egl/libq3dtools_esx.so
+vendor/lib/libC2D2.so
+vendor/lib/libCB.so
+vendor/lib/libOpenCL.so
+vendor/lib/libVkLayer_q3dtools.so
+vendor/lib/libadreno_utils.so
+vendor/lib/libc2d30_bltlib.so
+vendor/lib/libgpudataproducer.so
+vendor/lib/libgsl.so
+vendor/lib/libllvm-glnext.so
+vendor/lib/libllvm-qcom.so
+vendor/lib/libpvr.so
+vendor/lib64/egl/eglSubDriverAndroid.so
+vendor/lib64/egl/libEGL_adreno.so
+vendor/lib64/egl/libGLESv1_CM_adreno.so
+vendor/lib64/egl/libGLESv2_adreno.so
+vendor/lib64/egl/libq3dtools_adreno.so
+vendor/lib64/egl/libq3dtools_esx.so
+vendor/lib64/libC2D2.so
+vendor/lib64/libCB.so
+vendor/lib64/libOpenCL.so
+vendor/lib64/libVkLayer_q3dtools.so
+vendor/lib64/libadreno_utils.so
+vendor/lib64/libc2d30_bltlib.so
+vendor/lib64/libgpudataproducer.so
+vendor/lib64/libgsl.so
+vendor/lib64/libllvm-glnext.so
+vendor/lib64/libllvm-qcom.so
+vendor/lib64/libpvr.so

 # Graphics (Adreno firmware)
 vendor/firmware/a630_gmu.bin
 vendor/firmware/a630_sqe.fw

-# Graphics (Vulkan) - from PNX - RKQ1.200906.002
-vendor/lib/hw/vulkan.adreno.so|b2680e5b899d75fa3f82b457635e15c6998202a4
-vendor/lib64/hw/vulkan.adreno.so|fcc99045aaf7eed0925ac2b64ff2af085212954a
+# Graphics (Vulkan)
+vendor/lib/hw/vulkan.adreno.so
+vendor/lib64/hw/vulkan.adreno.so

 # Hotword Enrollment
 -priv-app/HotwordEnrollmentOKGoogleEx2TL3210/HotwordEnrollmentOKGoogleEx2TL3210.apk;PRESIGNED
 -priv-app/HotwordEnrollmentXGoogleEx2TL3210/HotwordEnrollmentXGoogleEx2TL3210.apk;PRESIGNED
-
-# Image Understanding
-vendor/saiv/image_understanding/db/aic_classifier/aic_classifier_cnn_light.caffemodel
-vendor/saiv/image_understanding/db/aic_classifier/aic_classifier_cnn.prototxt
-vendor/saiv/image_understanding/db/aic_detector/aic_detector_cnn_light.caffemodel
-vendor/saiv/image_understanding/db/aic_detector/aic_detector_cnn.prototxt
-vendor/saiv/image_understanding/db/aig_classifier/aig_classifier_cnn_light.caffemodel
-vendor/saiv/image_understanding/db/aig_classifier/aig_classifier_cnn.prototxt
-vendor/saiv/image_understanding/db/aig_detector/aig_detector_cnn_light.caffemodel
-vendor/saiv/image_understanding/db/aig_detector/aig_detector_cnn.prototxt
-vendor/saiv/image_understanding/db/QC_DSP_1.39.0_BV3.5CLS/6.5.1/slens_classifier_cnn.dlc
-vendor/saiv/image_understanding/db/QC_DSP_1.39.0_BV3.5OD/6.5.1/slens_detector_cnn.dlc
-
-# I/O Prefetcher
-vendor/lib/hw/vendor.qti.hardware.iop@2.0-impl.so
-vendor/lib/libqti-iopd-client.so
-vendor/lib/vendor.qti.hardware.iop@1.0.so
-vendor/lib/vendor.qti.hardware.iop@2.0.so
-vendor/lib64/hw/vendor.qti.hardware.iop@2.0-impl.so
-vendor/lib64/libqti-iopd-client.so
-vendor/lib64/vendor.qti.hardware.iop@1.0.so
-vendor/lib64/vendor.qti.hardware.iop@2.0.so
+system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
+system_ext/framework/com.android.hotwordenrollment.common.util.jar

 # IRQ Balance
 vendor/etc/msm_irqbalance.conf

 # Keymaster
-vendor/lib64/libkeymaster_helper_vendor.so
+vendor/lib64/libkeymaster_helper.so
 vendor/lib64/libkeymasterdeviceutils.so
 vendor/lib64/libkeymasterprovision.so
 vendor/lib64/libkeymasterutils.so
@@ -432,68 +411,53 @@ vendor/lib64/liblearningmodule.so
 vendor/lib64/libmeters.so
 vendor/lib64/libreffeature.so

-# Neural Networks
-vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-qti
-vendor/etc/init/android.hardware.neuralnetworks@1.2-service-qti.rc
-vendor/lib64/libhexagon_nn_stub.so
-vendor/lib64/unnhal-acc-adreno.so
-vendor/lib64/unnhal-acc-common.so
-vendor/lib64/unnhal-acc-hvx.so
+# OMX
+vendor/lib/libAlacSwDec.so
+vendor/lib/libApeSwDec.so
+vendor/lib/libFlacSwDec.so
+vendor/lib/libMpeg4SwEncoder.so
+vendor/lib/libOmxAacDec.so
+vendor/lib/libOmxAlacDec.so
+vendor/lib/libOmxAlacDecSw.so
+vendor/lib/libOmxAmrDec.so
+vendor/lib/libOmxAmrwbplusDec.so
+vendor/lib/libOmxApeDec.so
+vendor/lib/libOmxApeDecSw.so
+vendor/lib/libOmxDsdDec.so
+vendor/lib/libOmxEvrcDec.so
+vendor/lib/libOmxG711Dec.so
+vendor/lib/libOmxQcelp13Dec.so
+vendor/lib/libOmxSwVdec.so
+vendor/lib/libOmxSwVencMpeg4.so
+vendor/lib/libOmxVpp.so
+vendor/lib/libOmxWmaDec.so
+vendor/lib/libdsd2pcm.so
+vendor/lib/libmmosal.so
+vendor/lib/libswvdec.so
+vendor/lib64/libAlacSwDec.so
+vendor/lib64/libApeSwDec.so
+vendor/lib64/libFlacSwDec.so
+vendor/lib64/libMpeg4SwEncoder.so
+vendor/lib64/libOmxAacDec.so
+vendor/lib64/libOmxAlacDec.so
+vendor/lib64/libOmxAlacDecSw.so
+vendor/lib64/libOmxAmrDec.so
+vendor/lib64/libOmxAmrwbplusDec.so
+vendor/lib64/libOmxApeDec.so
+vendor/lib64/libOmxApeDecSw.so
+vendor/lib64/libOmxEvrcDec.so
+vendor/lib64/libOmxG711Dec.so
+vendor/lib64/libOmxQcelp13Dec.so
+vendor/lib64/libOmxSwVdec.so
+vendor/lib64/libOmxSwVencMpeg4.so
+vendor/lib64/libOmxVpp.so
+vendor/lib64/libOmxWmaDec.so
+vendor/lib64/libmmosal.so
+vendor/lib64/libswvdec.so

-# OMX - from PNX - RKQ1.200906.002
-vendor/lib/libAlacSwDec.so|e49062c9fd9377e8264bf8f7901394653b9f02dc
-vendor/lib/libApeSwDec.so|f14f08a55b32cc252417e3970b1d2cb296d48fa0
-vendor/lib/libFlacSwDec.so|bba6d4155029b2fd1a3d2dfe9f75f422f0d8a35e
-vendor/lib/libMpeg4SwEncoder.so|631e5c91aa89a1f0d60755f3dcea7d74e57af262
-vendor/lib/libOmxAacDec.so|3d90cded7de2423503025d115e2788e0eff7390f
-vendor/lib/libOmxAlacDec.so|0f0e8be4b1558fb7ab87c3b8dfa7f7a2cf33fe75
-vendor/lib/libOmxAlacDecSw.so|a8491930e40b32ae4f2f195b93847ad20e5a6275
-vendor/lib/libOmxAmrDec.so|942bb36c76ff125849b947acd1dbb8edcfee8b16
-vendor/lib/libOmxAmrwbplusDec.so|6869d09e4499824a476d3b036e025b5d70a83c70
-vendor/lib/libOmxApeDec.so|8de514dddfbd5a09f740cecbaf73bfb8c290ca9a
-vendor/lib/libOmxApeDecSw.so|cc1bec67919a9bfe899dd5c2b52f8a3ca6186262
-vendor/lib/libOmxDsdDec.so|5a58c8b54578c6c7520666df4040a422fea67df9
-vendor/lib/libOmxEvrcDec.so|58d55a09798ae13c90829c7ced2e7fee1c61d8b1
-vendor/lib/libOmxG711Dec.so|254245293c12e4d32217b0704bff5f676f4bb5de
-vendor/lib/libOmxQcelp13Dec.so|6c55114663ba69f2c2a7e6c69989fc79d67977b3
-vendor/lib/libOmxSwVdec.so|326fcf4174103efbd926fb046d12ba7d9121a312
-vendor/lib/libOmxSwVencMpeg4.so|cc082e75a01390e392e962a87b4a0dccf228585a
-vendor/lib/libOmxVideoDSMode.so|5862b9d707ca00cd87b70a7f581df49fa3304d2c
-vendor/lib/libOmxVpp.so|7a9a96445b55f28013ea8f4ed767c7e245420c4f
-vendor/lib/libOmxWmaDec.so|eab25fd58910bbeb57812c75fd3c5511c60fa592
-vendor/lib/libdsd2pcm.so|427be2997fcd72e94c33d08b2cf1fde5bf969fd4
-vendor/lib/libswvdec.so|0ebbd44d40c83333e99e47d64509a970a4052859
-vendor/lib64/libAlacSwDec.so|bfd2eb75d733c99d7c0b46f3016834f6f3ebcbdc
-vendor/lib64/libApeSwDec.so|96b957bd6d993737483d9d8705229b406d616ec7
-vendor/lib64/libFlacSwDec.so|720f8497fcbc3d98aa8ff333ed55ca575eb08815
-vendor/lib64/libMpeg4SwEncoder.so|1fc7361424c655ed94c1ac9280c4fe33903a65f6
-vendor/lib64/libOmxAacDec.so|98b894101c87beb61f0f1e5a9e3c6ea430441bdd
-vendor/lib64/libOmxAlacDec.so|3298ac6565f5362e7ed5c4196cfacc1c8811fa72
-vendor/lib64/libOmxAlacDecSw.so|934b495a864087b82b17a493ac498924701aa9e5
-vendor/lib64/libOmxAmrDec.so|f5302be684af636aa4b3101f268856fc7706a2a0
-vendor/lib64/libOmxAmrwbplusDec.so|a98845715e128e6c2649289988e4ff4de1ef9f8b
-vendor/lib64/libOmxApeDec.so|61416c5ed237a741e524b36c2b5c58a067896e9b
-vendor/lib64/libOmxApeDecSw.so|0c597c5ceb031322f2b6d8472c1c946ec4aabdea
-vendor/lib64/libOmxEvrcDec.so|e4d98d61ad8588956b7f4f937dd720164d584f7e
-vendor/lib64/libOmxG711Dec.so|53675a26d5386c868127304c6dfe9dd130f106f8
-vendor/lib64/libOmxQcelp13Dec.so|65952f3680f9865ea601de764037637d6ee8c990
-vendor/lib64/libOmxSwVdec.so|f891c5cb584e317ad0cb855c266100658406f556
-vendor/lib64/libOmxSwVencMpeg4.so|91f7a60674477b067d36493ddb44ea6c044b16ac
-vendor/lib64/libOmxVpp.so|a87440c7838b6f03726d97a4a52b695bb4c6e8f8
-vendor/lib64/libOmxWmaDec.so|7b2a714a74fea03a403a7d0edef61db2f70d7d4e
-vendor/lib64/libswvdec.so|ae1f55c7094e2a006e28dcfb0f2b9c32634fb849
-
-# Peripheral Manager
-vendor/bin/pm-proxy
-vendor/bin/pm-service
-vendor/lib/libperipheral_client.so
-vendor/lib/libspcom.so
-vendor/lib64/libperipheral_client.so
-vendor/lib64/libspcom.so
-
-# Power - Perf
-vendor/bin/hw/vendor.qti.hardware.perf@2.0-service
-vendor/etc/init/vendor.qti.hardware.perf@2.0-service.rc
+# Perf
+vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
+vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc
 vendor/etc/perf/commonresourceconfigs.xml
 vendor/etc/perf/perfboostsconfig.xml
 vendor/etc/perf/perfconfigstore.xml
@@ -502,17 +466,27 @@ vendor/etc/perf/targetresourceconfigs.xml
 vendor/etc/powerhint.xml
 vendor/lib/libperfconfig.so
 vendor/lib/libperfgluelayer.so
+vendor/lib/libperfioctl.so
 vendor/lib/libqti-perfd-client.so
 vendor/lib/libqti-perfd.so
 vendor/lib/libqti-util.so
 vendor/lib/libqti-utils.so
 vendor/lib64/libperfconfig.so
 vendor/lib64/libperfgluelayer.so
+vendor/lib64/libperfioctl.so
 vendor/lib64/libqti-perfd-client.so
 vendor/lib64/libqti-perfd.so
 vendor/lib64/libqti-util.so
 vendor/lib64/libqti-utils.so

+# Peripheral Manager
+vendor/bin/pm-proxy
+vendor/bin/pm-service
+vendor/lib/libperipheral_client.so
+vendor/lib/libspcom.so
+vendor/lib64/libperipheral_client.so
+vendor/lib64/libspcom.so
+
 # Power-off charging - from gts7lwifi - RP1A.200720.012
 system/bin/lpm|ba60e7e4338c86c1efdc35e7d9fb3715fbbd3073
 system/lib64/libmaet.so
@@ -539,6 +513,8 @@ vendor/bin/pd-mapper
 vendor/bin/rmt_storage
 vendor/bin/tftp_server
 vendor/etc/data/dsi_config.xml
+vendor/etc/init/vendor.qti.rmt_storage.rc
+vendor/etc/init/vendor.qti.tftp.rc
 vendor/etc/sec_config
 vendor/lib/libdiagjni.so
 vendor/lib/libdiag.so
@@ -584,35 +560,27 @@ vendor/lib/libsecnativefeature.so
 vendor/lib64/libsecnativefeature.so

 # SCVE
-vendor/etc/scve/facereco/gModel.dat
-vendor/lib/libscveBlobDescriptor.so
-vendor/lib/libscveBlobDescriptor_stub.so
 vendor/lib/libscveCommon.so
 vendor/lib/libscveCommon_stub.so
-vendor/lib/libscveFaceRecognition.so
 vendor/lib/libscveObjectSegmentation.so
 vendor/lib/libscveObjectSegmentation_stub.so
 vendor/lib/libscveObjectTracker.so
 vendor/lib/libscveObjectTracker_stub.so
-vendor/lib/libscvePanorama_lite.so
-vendor/lib/libscvePanorama.so
 vendor/lib/vendor.qti.hardware.scve.objecttracker@1.0.so
 vendor/lib/vendor.qti.hardware.scve.panorama@1.0.so
-vendor/lib64/libscveBlobDescriptor.so
-vendor/lib64/libscveBlobDescriptor_stub.so
 vendor/lib64/libscveCommon.so
 vendor/lib64/libscveCommon_stub.so
-vendor/lib64/libscveFaceRecognition.so
 vendor/lib64/libscveObjectSegmentation.so
 vendor/lib64/libscveObjectSegmentation_stub.so
 vendor/lib64/libscveObjectTracker.so
 vendor/lib64/libscveObjectTracker_stub.so
-vendor/lib64/libscvePanorama_lite.so
-vendor/lib64/libscvePanorama.so
 vendor/lib64/vendor.qti.hardware.scve.objecttracker@1.0.so
 vendor/lib64/vendor.qti.hardware.scve.panorama@1.0.so

 # Sensors
+vendor/bin/sensors.qti
+vendor/etc/init/init.vendor.sensors.rc
+vendor/etc/init/vendor.sensors.qti.rc
 vendor/etc/sensors/config/ak991x_dri_0.json
 vendor/etc/sensors/config/lsm6dsm_0.json
 vendor/etc/sensors/config/sdm710_ak991x_0.json
@@ -639,6 +607,7 @@ vendor/lib/libsensorslog.so
 vendor/lib/libsns_device_mode_stub.so
 vendor/lib/libsns_fastRPC_util.so
 vendor/lib/libsns_low_lat_stream_stub.so
+vendor/lib/libsns_registry_skel.so
 vendor/lib/libsnsapi.so
 vendor/lib/libssc.so
 vendor/lib/libssc_default_listener.so
@@ -650,6 +619,8 @@ vendor/lib64/libsensorslog.so
 vendor/lib64/libsns_device_mode_stub.so
 vendor/lib64/libsns_fastRPC_util.so
 vendor/lib64/libsns_low_lat_stream_stub.so
+vendor/lib64/libsns_registry_skel.so
+vendor/lib64/libsnsdiaglog.so
 vendor/lib64/libsnsapi.so
 vendor/lib64/libssc.so
 vendor/lib64/libssc_default_listener.so
@@ -666,38 +637,29 @@ vendor/lib/libgcs-calwrapper.so
 vendor/lib/libgcs-ipc.so
 vendor/lib/libgcs-osal.so
 vendor/lib/libgcs.so
-vendor/lib/liblistensoundmodel2.so
 vendor/lib64/libcapiv2svacnn.so
 vendor/lib64/libcapiv2vop.so
 vendor/lib64/libgcs-calwrapper.so
 vendor/lib64/libgcs-ipc.so
 vendor/lib64/libgcs-osal.so
 vendor/lib64/libgcs.so
-vendor/lib64/liblistensoundmodel2.so

-# Soter
-vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
-vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
-vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
-vendor/lib64/vendor.qti.hardware.soter@1.0.so
-
-# SPNE
-vendor/lib/libc++_shared.so
-vendor/lib/libSNPE.so
-vendor/lib/libsnpe_dsp_domains_v2.so
-vendor/lib/libsnpe_wrapper.so
-vendor/lib/libsymphony-cpu.so
-vendor/lib64/libc++_shared.so
+# SNPE
 vendor/lib64/libSNPE.so
+vendor/lib64/libc++_shared.so
 vendor/lib64/libsnpe_dsp_domains_v2.so
 vendor/lib64/libsnpe_wrapper.so
-vendor/lib64/libsymphony-cpu.so

 # Thermal
+vendor/bin/hw/vendor.samsung.hardware.thermal@1.0-service
 vendor/bin/thermal-engine
+vendor/etc/init/init_thermal-engine.rc
+vendor/etc/init/vendor.samsung.hardware.thermal@1.0-service.rc
+-vendor/etc/vintf/manifest/vendor.samsung.hardware.thermal@1.0-manifest.xml
 vendor/etc/thermal-engine.conf
 vendor/lib/libthermalclient.so
 vendor/lib64/libthermalclient.so
+vendor/lib64/vendor.samsung.hardware.thermal@1.0.so

 # Time
 -vendor/app/TimeService/TimeService.apk
@@ -707,9 +669,12 @@ vendor/lib/libtime_genoff.so
 vendor/lib64/libtime_genoff.so

 # TrustZone
+vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
 vendor/bin/qseecomd
 vendor/etc/init/qseecomd.rc
+vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc
 vendor/etc/gpfspath_oem_config.xml
+vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
 vendor/lib/libGPreqcancel.so
@@ -718,6 +683,7 @@ vendor/lib/libGPTEE_vendor.so
 vendor/lib/libminkdescriptor.so
 vendor/lib/libqcbor.so
 vendor/lib/libqisl.so
+vendor/lib/libops.so
 vendor/lib/libQSEEComAPI.so
 vendor/lib/librpmb.so
 vendor/lib/libsecureui.so
@@ -725,6 +691,8 @@ vendor/lib/libsecureui_svcsock.so
 vendor/lib/libSecureUILib.so
 vendor/lib/libssd.so
 vendor/lib/libStDrvInt.so
+vendor/lib/vendor.qti.hardware.qseecom@1.0.so
+vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
 vendor/lib64/libdrmfs.so
 vendor/lib64/libdrmtime.so
 vendor/lib64/libGPreqcancel.so
@@ -733,6 +701,7 @@ vendor/lib64/libGPTEE_vendor.so
 vendor/lib64/libminkdescriptor.so
 vendor/lib64/libqcbor.so
 vendor/lib64/libqisl.so
+vendor/lib64/libops.so
 vendor/lib64/libQSEEComAPI.so
 vendor/lib64/librpmb.so
 vendor/lib64/libsecureui.so
@@ -740,6 +709,7 @@ vendor/lib64/libsecureui_svcsock.so
 vendor/lib64/libSecureUILib.so
 vendor/lib64/libssd.so
 vendor/lib64/libStDrvInt.so
+vendor/lib64/vendor.qti.hardware.qseecom@1.0.so

 # Trusted User Interface
 vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti
@@ -747,24 +717,26 @@ vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc
 vendor/lib/vendor.qti.hardware.tui_comm@1.0.so
 vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so

-# VPP - from PNX - RKQ1.200906.002
-vendor/bin/vppservice|555301b19a86374900159423c88efd7bd9cea2f9
-vendor/etc/configstore/vpp.configstore.xml|d5095f33c326017a21fff186d19a2ce146b85d94
-vendor/etc/init/vppservice.rc|9daea1a00124d65ecb6978936785273edb74a8ed
-vendor/lib/libvppclient.so|3ec875c9813494878d3bbea32d65070fa68af0f1
-vendor/lib/libvpphvx.so|a3869a611414316250b71be42b69638c31e9a8f9
-vendor/lib/libvpplibrary.so|c7c2e2a64ef4a1d4d4103130835da94f58eb2f4b
-vendor/lib/vendor.qti.hardware.vpp@1.1.so|8df356bc93951b2072590ff17c5d7af08b4e8299
-vendor/lib/vendor.qti.hardware.vpp@1.2.so|edd5e3b33c51c31c8e9e54912269e893c4e3c730
-vendor/lib64/libvppclient.so|3cf0dc7ce3fa3adf9d05e674e3359fadd02a730c
-vendor/lib64/libvpphvx.so|e1cfc643118f32a73d45c78929edc9815705229d
-vendor/lib64/libvpplibrary.so|3cdb980f51d0c0eecdb878eb869102c038b2f803
-vendor/lib64/vendor.qti.hardware.vpp@1.1.so|f7769685d9c0c74f8c8419db028a5d5c3f65a9da
-vendor/lib64/vendor.qti.hardware.vpp@1.2.so|ca1906012d0ab6dc9048aa49703833512308e6cf
+# VPP
+vendor/bin/vppservice
+vendor/etc/configstore/vpp.configstore.xml
+vendor/etc/init/vppservice.rc
+vendor/lib/libvppclient.so
+vendor/lib/libvpphvx.so
+vendor/lib/libvpplibrary.so
+vendor/lib/vendor.qti.hardware.vpp@1.1.so
+vendor/lib/vendor.qti.hardware.vpp@1.2.so
+vendor/lib64/libvppclient.so
+vendor/lib64/libvpphvx.so
+vendor/lib64/libvpplibrary.so
+vendor/lib64/vendor.qti.hardware.vpp@1.1.so
+vendor/lib64/vendor.qti.hardware.vpp@1.2.so

 # WiFi
 vendor/bin/hw/macloader
 vendor/bin/cnss-daemon
+vendor/etc/init/wifi_qcom.rc
+vendor/etc/init/wifi.rc:vendor/etc/init/wifi_sec.rc

 # WiFi Display - from PNX - RKQ1.200906.002
 -system/framework/WfdCommon.jar|aa7470dd5ccb2e2c695fd54c3aff01d21e2d7472
@@ -822,7 +794,6 @@ vendor/etc/seccomp_policy/wfdvndservice.policy|b46f0c22a1f9b65c6750205e161c0a3f8
 vendor/etc/seccomp_policy/wifidisplayhalservice.policy|f113f27e0e301a18baf0ade08c23071a27c7dc52
 vendor/etc/wfdconfig.xml|9e13371f7ae509cc0bbb3f2ace93c5ea5d87bf0f
 vendor/lib/libFileMux_proprietary.so|e59edd4604a7c73147118161cab5b7ac6bb16c82
-vendor/lib/libmmosal.so|57185feced72009af2df1b09117702c9fae7182b
 vendor/lib/libmmrtpdecoder_proprietary.so|9232f505ea8f0c1e9f81a049c583fba32a450d73
 vendor/lib/libmmrtpencoder_proprietary.so|d8386b78c976d94867455c67dd10d63e8a343363
 vendor/lib/libwfdcodecv4l2_proprietary.so|70a2900804160bc53bb19c11e81278ffde0c5fee
--- a/releasetools.py
+++ b/releasetools.py
@@ -77,7 +77,7 @@ def AddTrustZoneAssertion(info, input_zip):
  if m:
    versions = m.group(1).split('|')
    if len(versions) and '*' not in versions:
-      cmd = 'assert(samsung.verify_trustzone(' + ','.join(['"%s"' % tz for tz in versions]) + ') == "1" || abort("ERROR: This package requires firmware from an Android 10 based stock ROM build. Please upgrade firmware and retry!"););'
+      cmd = 'assert(samsung.verify_trustzone(' + ','.join(['"%s"' % tz for tz in versions]) + ') == "1" || abort("ERROR: This package requires firmware from an Android 11 based stock ROM build. Please upgrade firmware and retry!"););'
      info.script.AppendExtra(cmd)

 def OTA_InstallEnd(info):
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -116,19 +116,3 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/ueventd.qcom.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := wifi_qcom.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/wifi_qcom.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := wifi_sec.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/wifi_sec.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT)
--- a/rootdir/bin/init.qcom.sensors.sh
+++ b/rootdir/bin/init.qcom.sensors.sh
@@ -1,5 +1,5 @@
 #!/vendor/bin/sh
-# Copyright (c) 2015,2018 The Linux Foundation. All rights reserved.
+# Copyright (c) 2020 The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,19 +29,5 @@
 #
 # Function to start sensors for SSC enabled platforms
 #
-start_sensors()
-{
-    chmod -h 775 /mnt/vendor/persist/sensors
-    chmod -h 664 /mnt/vendor/persist/sensors/sensors_settings
-    mkdir -p /mnt/vendor/persist/sensors/registry/registry
-    chown -h -R system.system /mnt/vendor/persist/sensors
-    #start vendor.sensors.qti
-    start factory_ssc
-
-    # Only for SLPI
-    if [ -c /dev/msm_dsps -o -c /dev/sensors ]; then
-        start vendor.sensors
-    fi
-}
-
-start_sensors
+cp /vendor/etc/sensors/scripts/* /data/vendor/sensors/scripts/
+chmod a+rw /data/vendor/sensors/scripts/*
--- a/rootdir/bin/init.qcom.usb.sh
+++ b/rootdir/bin/init.qcom.usb.sh
@@ -117,15 +117,6 @@ if [ "$(getprop persist.vendor.usb.config)" == "" -a "$(getprop ro.build.type)"
      fi
 fi

-usb_config=`getprop persist.sys.usb.config`
-case "$usb_config" in
-    "" | "adb") #USB persist config not set, select default configuration
-    setprop persist.sys.usb.config diag,adb
-    ;;
-  * )
-  ;; #USB persist config exists, do nothing
-esac
-
 # This check is needed for GKI 1.0 targets where QDSS is not available
 if [ "$(getprop persist.vendor.usb.config)" == "diag,serial_cdev,rmnet,dpl,qdss,adb" -a \
     ! -d /config/usb_gadget/g1/functions/qdss.qdss ]; then
@@ -160,6 +151,7 @@ if [ -d /config/usb_gadget ]; then
 		serialno=1234567
 		echo $serialno > /config/usb_gadget/g1/strings/0x409/serialnumber
 	fi
+	setprop vendor.usb.configfs 1

 	persist_comp=`getprop persist.sys.usb.config`
 	comp=`getprop sys.usb.config`
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -45,6 +45,10 @@ on early-init
  # Change ownership of sysfs power control node
    chown system graphics /sys/class/drm/card0/device/power/control

+    # Change ownership of sw_sync node
+    chown system graphics /sys/kernel/debug/sync/sw_sync
+    chmod 0666 /sys/kernel/debug/sync/sw_sync
+
    chown root system /dev/kmsg
    chmod 0620 /dev/kmsg
    # Load WIGIG platform driver
@@ -158,10 +162,8 @@ on boot
    # Fingerprint sensor
    chmod 0660 /dev/esfp0
    chmod 0660 /dev/vfsspi
-    chmod 0660 /dev/goodix_fp
    chown system system /dev/esfp0
    chown system system /dev/vfsspi
-    chown system system /dev/goodix_fp
    chown system radio /sys/class/fingerprint/fingerprint/type_check
    chown system radio /sys/class/fingerprint/fingerprint/name
    chown system radio /sys/class/fingerprint/fingerprint/vendor
@@ -245,6 +247,10 @@ on boot

 # msm specific files that need to be created on /data
 on post-fs-data
+    #FINGERPRINT
+    mkdir /data/vendor/biometrics 0770 system system
+    mkdir /data/vendor/fpSnrTest 0770 system
+
    mkdir /data/vendor/misc 01771 system system

    # Create directory used for dump collection
@@ -380,13 +386,6 @@ on post-fs-data
    #Create dir for TUI
    mkdir /data/vendor/tui 0700 system drmrpc

-    # FINGERPRINT
-    mkdir /data/vendor/biometrics 0770 system system
-    mkdir /data/vendor/fpSnrTest 0770 system system
-
-    #argos
-    chown system system /dev/network_throughput
-
 service nqnfcinfo /system/vendor/bin/nqnfcinfo
    class late_start
    group nfc
@@ -513,6 +512,7 @@ service irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config"
    class core
    user root
    oneshot
+    disabled

 service qmiproxy /system/bin/qmiproxy
    class main
@@ -763,12 +763,12 @@ on property:vendor.rild.libpath=*
 on property:ro.vendor.radio.noril=*
    setprop ro.radio.noril ${ro.vendor.radio.noril}

-service vendor.hbtp /vendor/bin/hbtp_daemon
-     class main
-     user system
-     group system
-     capabilities SYS_NICE
-     disabled
+#service vendor.hbtp /vendor/bin/hbtp_daemon
+#     class main
+#     user system
+#     group system
+#     capabilities SYS_NICE
+#     disabled

 #service chre /vendor/bin/chre
 #    class late_start
@@ -777,16 +777,6 @@ service vendor.hbtp /vendor/bin/hbtp_daemon
 #    socket chre seqpacket 0660 root system
 #    shutdown critical

-# ARGOSD
-service argos-daemon /vendor/bin/argosd
-    class main
-    user system
-    group system radio
-    disabled
-
-on property:sys.boot_completed=1
-    start argos-daemon
-
 #Set GPU Opengles version
 on property:vendor.opengles.version=*
    setprop ro.opengles.version ${vendor.opengles.version}
--- a/rootdir/etc/init.qcom.usb.rc
+++ b/rootdir/etc/init.qcom.usb.rc
@@ -26,27 +26,47 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #

-on charger
+on init
+    chown system radio /sys/class/host_notify/usb_otg/booster
+    chmod 0660 /sys/class/host_notify/usb_otg/booster
+    chown system radio /sys/class/usb_notify/usb_control/disable
+    chmod 0660 /sys/class/usb_notify/usb_control/disable
+
+    # USB HW param
+    chown system usb /sys/class/usb_notify/usb_control/usb_hw_param
+    chmod 0664 /sys/class/usb_notify/usb_control/usb_hw_param
+    chown system usb /sys/class/usb_notify/usb_control/hw_param
+    chmod 0664 /sys/class/usb_notify/usb_control/hw_param
+
+    # USB whitelist
+    chown system usb /sys/class/usb_notify/usb_control/whitelist_for_mdm
+    chmod 0664 /sys/class/usb_notify/usb_control/whitelist_for_mdm
+
+on charger && property:ro.debuggable=1
+    mkdir /dev/usb-ffs 0770 shell shell
+    mkdir /dev/usb-ffs/adb 0770 shell shell
    mount configfs none /config
    mkdir /config/usb_gadget/g1 0770
    mkdir /config/usb_gadget/g1/strings/0x409 0770
    write /config/usb_gadget/g1/bcdUSB 0x0200
    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
-    mkdir /config/usb_gadget/g1/functions/mass_storage.0
+    mkdir /config/usb_gadget/g1/functions/ffs.adb
    mkdir /config/usb_gadget/g1/configs/b.1 0770
    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770
    write /config/usb_gadget/g1/configs/b.1/MaxPower 900
    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
-    exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qcom.usb.sh
-    write /config/usb_gadget/g1/strings/0x409/product ${vendor.usb.product_string}
-    setprop sys.usb.config mass_storage
+    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+#    exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qcom.usb.sh
+    write /sys/class/android_usb/android0/f_ffs/aliases adb
+    setprop sys.usb.config adb
    setprop sys.usb.configfs 1

+
 on boot
    mount configfs none /config
-    mkdir /config/usb_gadget/g1 0770
-    mkdir /config/usb_gadget/g2 0770
+    mkdir /config/usb_gadget/g1
+    mkdir /config/usb_gadget/g2
    mkdir /config/usb_gadget/g1/strings/0x409 0770
    mkdir /config/usb_gadget/g2/strings/0x409 0770
    write /config/usb_gadget/g1/bcdUSB 0x0200
@@ -112,9 +132,29 @@ on boot
    exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qcom.usb.sh
    write /config/usb_gadget/g1/strings/0x409/product ${vendor.usb.product_string}
    write /config/usb_gadget/g2/strings/0x409/product ${vendor.usb.product_string}
-    setprop sys.usb.config ${persist.vendor.usb.config}
+#    setprop sys.usb.config ${persist.vendor.usb.config}
    setprop sys.usb.configfs 1

+    # MTP permission
+    chmod 0660 /dev/usb_mtp_gadget
+    chown system mtp /dev/usb_mtp_gadget
+    mkdir /dev/socket/mtp 0770 system mtp
+
+    # CDFS permission
+    chown system system /config/usb_gadget/g1/functions/mass_storage.0/lun.0/file
+    chmod 0660 /config/usb_gadget/g1/functions/mass_storage.0/lun.0/file
+
+    # NCM permission
+    chown system system /sys/class/android_usb/android0/terminal_version
+    chmod 0660 /sys/class/android_usb/android0/terminal_version
+
+    # Ethernet Address permission
+    chown system system /sys/class/android_usb/android0/f_rndis/ethaddr
+    chmod 0660 /sys/class/android_usb/android0/f_rndis/ethaddr
+
+    # Set rndis_class_id = 1 for Samsung RNDIS driver
+    write /config/usb_gadget/g1/functions/gsi.rndis/rndis_class_id 1
+
 on boot && property:vendor.usb.use_ffs_mtp=1
   mkdir /config/usb_gadget/g1/functions/ffs.mtp
   mkdir /config/usb_gadget/g1/functions/ffs.ptp
@@ -137,19 +177,9 @@ on boot && property:ro.boot.usbconfigfs=true
 #

 on property:sys.usb.config=none && property:sys.usb.configfs=1
-#    rm /config/usb_gadget/g1/configs/b.1/f1
-#    rm /config/usb_gadget/g1/configs/b.1/f2
-#    rm /config/usb_gadget/g1/configs/b.1/f3
-#    rm /config/usb_gadget/g1/configs/b.1/f4
-#    rm /config/usb_gadget/g1/configs/b.1/f5
-#    rm /config/usb_gadget/g1/configs/b.1/f6
-#    rm /config/usb_gadget/g1/configs/b.1/f7
-#    rm /config/usb_gadget/g1/configs/b.1/f8
-#    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/UDC "none"
    stop adbd
    setprop sys.usb.ffs.ready 0
-    stop ss_conn_daemon2_service
    write /config/usb_gadget/g1/bDeviceClass 0
    write /config/usb_gadget/g1/bDeviceSubClass 0
    write /config/usb_gadget/g1/bDeviceProtocol 0
@@ -808,7 +838,8 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,diag_mdm,qdss,qd

 # For CDFS composite
 on property:sys.usb.config=mass_storage && property:sys.usb.configfs=1
-#    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "msc"
+    chown system system /config/usb_gadget/g1/functions/mass_storage.0/lun.0/file
+    chmod 0660 /config/usb_gadget/g1/functions/mass_storage.0/lun.0/file
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
@@ -828,7 +859,8 @@ on property:sys.usb.config=mass_storage,adb && property:sys.usb.configfs=1
    start adbd

 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mass_storage,adb && property:sys.usb.configfs=1
-#    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb_msc"
+    chown system system /config/usb_gadget/g1/functions/mass_storage.0/lun.0/file
+    chmod 0660 /config/usb_gadget/g1/functions/mass_storage.0/lun.0/file
    rm /config/usb_gadget/g1/configs/b.1/f1
    rm /config/usb_gadget/g1/configs/b.1/f2
    rm /config/usb_gadget/g1/configs/b.1/f3
@@ -840,8 +872,8 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mass_storage,adb && p
    rm /config/usb_gadget/g1/configs/b.1/f9
    write /config/usb_gadget/g1/idVendor 0x04E8
    write /config/usb_gadget/g1/idProduct 0x685E
-    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/mass_storage.0 /config/usb_gadget/g1/configs/b.1/f2
+    symlink /config/usb_gadget/g1/functions/mass_storage.0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}

@@ -859,8 +891,8 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,adb && property:
    rm /config/usb_gadget/g1/configs/b.1/f7
    rm /config/usb_gadget/g1/configs/b.1/f8
    rm /config/usb_gadget/g1/configs/b.1/f9
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/idProduct 0x685D
+    write /config/usb_gadget/g1/idVendor 0x05C6
+    write /config/usb_gadget/g1/idProduct 0x901D
    write /config/usb_gadget/g1/functions/diag.diag/pid 0x901d
    symlink /config/usb_gadget/g1/functions/${vendor.usb.diag.func.name}.diag /config/usb_gadget/g1/configs/b.1/f1
    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
@@ -2287,39 +2319,39 @@ on property:sys.usb.config=diag,diag_cnss,serial_cdev,rmnet,dpl,qdss && property
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
    setprop sys.usb.state ${sys.usb.config}

-on property:sys.usb.config=adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idVendor 0x18d1
-    write /config/usb_gadget/g1/idProduct 0x4ee7
+#on property:sys.usb.config=adb && property:sys.usb.configfs=1
+#    write /config/usb_gadget/g1/idVendor 0x18d1
+#    write /config/usb_gadget/g1/idProduct 0x4ee7

 #on property:sys.usb.config=mtp && property:sys.usb.configfs=1
 #    write /config/usb_gadget/g1/idVendor 0x18d1
 #    write /config/usb_gadget/g1/idProduct 0x4ee1

-on property:sys.usb.config=mtp && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
-    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
+#on property:sys.usb.config=mtp && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
+#    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1

 #on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
 #    write /config/usb_gadget/g1/idVendor 0x18d1
 #    write /config/usb_gadget/g1/idProduct 0x4ee2

-on property:sys.usb.config=mtp,adb && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
-    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
+#on property:sys.usb.config=mtp,adb && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
+#    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
+#    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2

 #on property:sys.usb.config=ptp && property:sys.usb.configfs=1
 #    write /config/usb_gadget/g1/idVendor 0x18d1
 #    write /config/usb_gadget/g1/idProduct 0x4ee5

-on property:sys.usb.config=ptp && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
-    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
+#on property:sys.usb.config=ptp && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
+#    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1

 #on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
 #    write /config/usb_gadget/g1/idVendor 0x18d1
 #    write /config/usb_gadget/g1/idProduct 0x4ee6

-on property:sys.usb.config=ptp,adb && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
-    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
+#on property:sys.usb.config=ptp,adb && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
+#    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
+#    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2

 #on property:sys.usb.config=accessory && property:sys.usb.configfs=1
 #    write /config/usb_gadget/g1/idVendor 0x18d1
--- a/rootdir/etc/init.samsung.bsp.rc
+++ b/rootdir/etc/init.samsung.bsp.rc
@@ -29,11 +29,8 @@
 #

 on early-init
-    write /dev/watchdog "s"

 on init
-    chown root system /dev/watchdog
-    chmod 0660 /dev/watchdog
    symlink /dev/block/bootdevice/by-name/param /dev/block/param
   # CONFIG_SEC_DEBUG ++
    # reset_reason
@@ -48,11 +45,11 @@ on init
    chown system system /proc/reset_tzlog
    chmod 0400 /proc/reset_tzlog
    chown system system /proc/store_lastkmsg
-    chmod 0400 /proc/store_lastkmsg
+    chmod 0440 /proc/store_lastkmsg
    chown system system /proc/auto_comment
    chmod 0400 /proc/auto_comment
    chown system system /proc/reset_rwc
-    chmod 0400 /proc/reset_rwc
+    chmod 0440 /proc/reset_rwc
    chown system system /proc/reset_history
    chmod 0400 /proc/reset_history

@@ -102,9 +99,11 @@ on init

    # sdcard ramdump
    chown system system /sys/module/sec_debug/parameters/dump_sink
-    chmod 0600 /sys/module/sec_debug/parameters/dump_sink
+    chmod 0640 /sys/module/sec_debug/parameters/dump_sink
+    chown system system /sys/module/sec_debug/parameters/reboot_multicmd
+    chmod 0400 /sys/module/sec_debug/parameters/reboot_multicmd
    chown system system /proc/rdx_bootdev
-    chmod 0200 /proc/rdx_bootdev
+    chmod 0220 /proc/rdx_bootdev
    # CONFIG_SEC_DEBUG --

 on late-init
@@ -122,9 +121,3 @@ on shutdown
 # service definition

 # on property triggers
-
-# watchdog disable in case of charger & GSI booting
-on property:ro.bootmode=charger
-    write /dev/watchdog "V"
-on property:ro.boot.verifiedbootstate=orange  # orange : unlocked state of GSI img
-    write /dev/watchdog "V"
--- a/rootdir/etc/init.samsung.rc
+++ b/rootdir/etc/init.samsung.rc
@@ -44,23 +44,59 @@ on fs
    mount_all /vendor/etc/fstab.samsung --early
    mount none /mnt/vendor/dqmdbg /dqmdbg bind

-# Create carrier folder for HiddenMenu
-on post-fs
-    mkdir /efs/carrier 0755 system system
-    restorecon_recursive /efs
-
-    restorecon_recursive /mnt/vendor/efs
-    chown radio system /mnt/vendor/efs
-    chmod 0771 /mnt/vendor/efs
-
 on late-fs
    mount_all /vendor/etc/fstab.samsung --late

+on post-fs-data
+    # carrier partition
+    chown system system /carrier
+    chmod 0771 /carrier
+    restorecon /carrier
+
 on boot
+#Permission for SystemPerformance
+    chown root system /sys/power/cpufreq_max_limit
+    chown root system /sys/power/cpufreq_min_limit
+    chown root system /sys/power/cpufreq_table
+    chmod 664 /sys/power/cpufreq_max_limit
+    chmod 664 /sys/power/cpufreq_min_limit
+    chmod 664 /sys/power/cpufreq_table
+    chown root system /sys/class/kgsl/kgsl-3d0/min_pwrlevel
+    chown root system /sys/class/kgsl/kgsl-3d0/max_pwrlevel
+    chown root system /sys/class/kgsl/kgsl-3d0/gpu_available_frequencies
+    chmod 0664 /sys/class/kgsl/kgsl-3d0/min_pwrlevel
+    chmod 0664 /sys/class/kgsl/kgsl-3d0/max_pwrlevel
+    chmod 0664 /sys/class/kgsl/kgsl-3d0/gpu_available_frequencies
+    chown root system /sys/class/devfreq/soc:qcom,cpubw/available_frequencies
+    chown root system /sys/class/devfreq/soc:qcom,cpubw/min_freq
+    chown root system /sys/class/devfreq/soc:qcom,cpubw/max_freq
+    chmod 664 /sys/class/devfreq/soc:qcom,cpubw/available_frequencies
+    chmod 664 /sys/class/devfreq/soc:qcom,cpubw/min_freq
+    chmod 664 /sys/class/devfreq/soc:qcom,cpubw/max_freq
+    chmod 0664 /sys/class/devfreq/soc:qcom,mincpubw/available_frequencies
+    chmod 0664 /sys/class/devfreq/soc:qcom,mincpubw/min_freq
+    chown system system /sys/class/input_booster/level
+    chown system system /sys/class/input_booster/head
+    chown system system /sys/class/input_booster/tail
+    chown system system /sys/class/input_booster/touchkey/level
+    chown system system /sys/class/input_booster/touchkey/freq
+    chown system system /sys/class/input_booster/touchkey/time
+    chmod 0664 /sys/class/input_booster/level
+    chmod 0664 /sys/class/input_booster/head
+    chmod 0664 /sys/class/input_booster/tail
+    chmod 0664 /sys/class/input_booster/touchkey/level
+    chmod 0664 /sys/class/input_booster/touchkey/freq
+    chmod 0664 /sys/class/input_booster/touchkey/time
+
+    # Meta event
+    chown system radio /sys/class/sensors/sensor_dev/flush
+
 # Permission for nfc, eSE driver
+    chmod 0660 /dev/sec-nfc
+    chmod 0660 /dev/p3
+    chown nfc nfc /dev/sec-nfc
+    chown system system /dev/p3
    chmod 0660 /dev/pn547
    chmod 0660 /dev/p61
    chown nfc nfc /dev/pn547
    chown system system /dev/p61
-    chmod 0660 /dev/sec-nfc
-    chown nfc nfc /dev/sec-nfc
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -38,7 +38,6 @@ on fs
    wait /dev/block/platform/soc/${ro.boot.bootdevice}
    symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
    mount_all /vendor/etc/fstab.qcom --early
-    setprop ro.crypto.fde_algorithm AES-256-XTS
    chown root system /mnt/vendor/persist
    chmod 0771 /mnt/vendor/persist
    restorecon_recursive /mnt/vendor/persist
@@ -136,6 +135,9 @@ on post-fs-data
    chown system audio /dev/dbmdx-1
    chown system audio /sys/class/voicep/dbmdx/va_mic_mode

+on early-boot
+    start irsc_util
+
 on boot
    # chown system system /sys/kernel/hbtp/display_pwr
    start rmt_storage
@@ -144,20 +146,6 @@ on boot
 #Load WLAN driver
    insmod /vendor/lib/modules/qca_cld3_wlan.ko

-# for WIFI MAC address
-    mkdir /mnt/vendor/efs/wifi 0755 wifi wifi
-    chown wifi wifi /mnt/vendor/efs/wifi/.mac.info
-    chmod 0644 /mnt/vendor/efs/wifi/.mac.info
-    chown wifi wifi /mnt/vendor/efs/wifi/.mac.cob
-    chmod 0644 /mnt/vendor/efs/wifi/.mac.cob
-
-# for WIFI MAC address (Upgrade model from O)
-    mkdir /efs/wifi 0755 wifi wifi
-    chown wifi wifi /efs/wifi/.mac.info
-    chmod 0644 /efs/wifi/.mac.info
-    chown wifi wifi /efs/wifi/.mac.cob
-    chmod 0644 /efs/wifi/.mac.cob
-
 #USB controller configuration
    setprop vendor.usb.rndis.func.name "gsi"
    setprop vendor.usb.rmnet.func.name "gsi"
--- a/rootdir/etc/wifi_qcom.rc
+++ b/rootdir/etc/wifi_qcom.rc
@@ -1,39 +0,0 @@
-on post-fs-data
-    # for fwpath
-    chmod 0666 /sys/module/wlan/parameters/fwpath
-
-    chown wifi root /sys/wifi/wifiver
-    chmod 0660 /sys/wifi/wifiver
-    chown wifi root /sys/wifi/softap
-    chmod 0660 /sys/wifi/softap
-
-    # for WIFI Antenna
-    write /data/vendor/conn/.wificable.info E
-    chown system root /data/vendor/conn/.wificable.info
-    chmod 0666 /data/vendor/conn/.wificable.info
-    chown wifi root /sys/wifi/wificable
-    chmod 0664 /sys/wifi/wificable
-	
-	# for WIFI TRP/TIS
-    chown wifi root /data/vendor/conn/.psm.info
-    chmod 0664 /data/vendor/conn/.psm.info
-    chown wifi root /sys/wifi/pm
-    chmod 0660 /sys/wifi/pm
-
-    # for WIFI Antenna Selection
-    chown wifi root /data/vendor/conn/.ant.info
-    chmod 0664 /data/vendor/conn/.ant.info
-
-on boot
-# for wlan FTM app
-service ftm_ptt /system/bin/ftm_ptt -d
-    user root
-    group radio system
-    disabled
-
-# [ Wi-Fi init
-service wlandutservice /system/bin/wlandutservice
-    class main
-    group system wifi net_raw net_admin inet
-    disabled
-    oneshot
--- a/rootdir/etc/wifi_sec.rc
+++ b/rootdir/etc/wifi_sec.rc
@@ -1,51 +0,0 @@
-# Wi-Fi init file
-on post-fs-data
-    mkdir /data/vendor/conn 0771 wifi root
-    mkdir /data/vendor/wifi 0771 wifi wifi
-    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
-    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
-    mkdir /data/vendor/log/wifi 0770 wifi system
-
-    # for WIFI TRP/TIS
-    chown wifi root /data/vendor/conn/.psm.info
-    chmod 0660 /data/vendor/conn/.psm.info
-
-    # for WIFI Antenna Selection
-    chown wifi root /data/vendor/conn/.ant.info
-    chmod 0660 /data/vendor/conn/.ant.info
-
-    # for WIFI Version
-    chown wifi root /data/vendor/conn/.wifiver.info
-    chmod 0664 /data/vendor/conn/.wifiver.info
-
-    # for WIFI MEMDUMP
-    # The default value of below memdump file is set in SecProductFeature
-    #write /data/vendor/conn/.memdump.info 2
-    chown wifi root /data/vendor/conn/.memdump.info
-    chmod 0660 /data/vendor/conn/.memdump.info
-
-    # for WIFI hotspot
-    chown wifi root /data/vendor/conn/.softap.info
-    chmod 0664 /data/vendor/conn/.softap.info
-    chown system wifi /vendor/etc/wifi/indoorchannel.info
-    chmod 0664 /vendor/etc/wifi/indoorchannel.info
-
-    # for WIFI MAC
-    chown wifi root /sys/wifi/mac_addr
-    chmod 0660 /sys/wifi/mac_addr
-    
-on boot
-    setprop wifi.interface wlan0
-
-# start for WiFi MFG (TestMode)
-service mfgloader /system/vendor/bin/hw/mfgloader
-    class main
-    disabled
-    oneshot
-
-service macloader /system/vendor/bin/hw/macloader
-    class main
-    oneshot
-
-# end of WiFi MFG (TestMode)
-
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -168,13 +168,13 @@

 # HALs
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.samsung    u:object_r:hal_fingerprint_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.health@2\.0-service\.samsung                     u:object_r:hal_health_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.health@2\.1-service-samsung                      u:object_r:hal_health_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@4\.0-service\.samsung                  u:object_r:hal_keymaster_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.samsung                      u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.1-service\.gts4lv                         u:object_r:hal_usb_default_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-qti                  u:object_r:hal_neuralnetworks_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.fastcharge@1\.0-service\.samsung                   u:object_r:hal_lineage_fastcharge_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.samsung-qcom             u:object_r:hal_lineage_livedisplay_sysfs_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.thermal@1\.0-service                     u:object_r:hal_thermal_default_exec:s0

 # Sys
 /sys/class/camera(/.*)?                                     --  u:object_r:sysfs_camera_writable:s0
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@@ -7,3 +7,4 @@ vendor.samsung.hardware.health::ISehHealth
 vendor.samsung.hardware.radio::ISehRadio                                               u:object_r:hal_telephony_hwservice:s0
 vendor.samsung.hardware.radio.bridge::ISehBridge                                       u:object_r:hal_telephony_hwservice:s0
 vendor.samsung.hardware.radio.channel::ISehChannel                                     u:object_r:hal_telephony_hwservice:s0
+vendor.samsung.hardware.thermal::ISehThermal                                           u:object_r:hal_thermal_hwservice:s0
--- a/sepolicy/vendor/sensors.te
+++ b/sepolicy/vendor/sensors.te
@@ -0,0 +1 @@
+allow sensors sensors_vendor_data_file:fifo_file create_file_perms;
--- a/vendor.prop
+++ b/vendor.prop
@@ -8,6 +8,7 @@ persist.vendor.audio.fluence.audiorec=false
 persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.fluence.tmic.enabled=false
 persist.vendor.audio.fluence.voicecall=true
+persist.vendor.audio.fluence.voicecomm=true
 persist.vendor.audio.fluence.voicerec=false
 persist.vendor.audio.hifi.int_codec=true
 persist.vendor.audio.ras.enabled=false
@@ -65,6 +66,7 @@ vendor.audio.feature.vbat.enable=true
 vendor.audio.feature.wsa.enable=false
 vendor.audio.flac.sw.decoder.24bit=true
 vendor.audio.hal.boot.timeout.ms=20000
+vendor.audio_hal.period_size=192
 vendor.audio.hw.aac.encoder=true
 vendor.audio.noisy.broadcast.delay=600
 vendor.audio.offload.buffer.size.kb=64
@@ -80,11 +82,12 @@ vendor.audio.safx.pbe.enabled=false
 vendor.audio.tunnel.encode=false
 vendor.audio.use.sw.alac.decoder=true
 vendor.audio.use.sw.ape.decoder=true
-vendor.audio_hal.period_size=192
+vendor.audio.volume.headset.gain.depcal=true
 vendor.voice.path.for.pcm.voip=true

 # Bluetooth
 persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
+persist.vendor.qcom.bluetooth.soc=cherokee
 vendor.qcom.bluetooth.soc=cherokee

 # Dalvik
@@ -97,8 +100,21 @@ dalvik.vm.heaptargetutilization=0.75

 # Display
 debug.gralloc.gfx_ubwc_disable=0
+debug.sf.early_app_phase_offset_ns=100000
+debug.sf.early_phase_offset_ns=100000
+debug.sf.early_gl_app_phase_offset_ns=100000
+debug.sf.early_gl_phase_offset_ns=100000
 debug.sf.enable_hwc_vds=1
+debug.sf.high_fps_early_gl_phase_offset_ns=100000
+debug.sf.high_fps_early_phase_offset_ns=100000
+debug.sf.high_fps_late_app_phase_offset_ns=100000
+debug.sf.high_fps_late_sf_phase_offset_ns=100000
 ro.vendor.display.cabl=2
+vendor.display.enable_default_color_mode=1
+vendor.display.disable_dynamic_fps=1
+vendor.display.disable_ext_anim=1
+vendor.display.idle_time=0
+vendor.display.idle_time_inactive=0

 # fastbootd
 ro.fastbootd.available=true
@@ -117,8 +133,6 @@ persist.demo.hdmirotationlock=false
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
 ro.opengles.version=196610
-vendor.display.disable_ext_anim=1
-vendor.display.enable_default_color_mode=1

 # Keystore
 ro.hardware.keystore=mdfpp
--- a/wifi/indoorchannel.info
+++ b/wifi/indoorchannel.info
@@ -95,7 +95,7 @@ HU 36 40 44 48 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140
 IE 36 40 44 48 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140
 IL 36 40 44 48 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140 144
 IM 36 40 44 48 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140
-IN 36 40 44 48 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140 144 149 153 157 161
+IN 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140 144
 IO 36 40 44 48 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140 144
 IQ 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140
 IR 52 56 60 64 100 104 108 112 116 120 124 128 132 136 140 144
				`@@ -0,0 +1 @@`
				`allow sensors sensors_vendor_data_file:fifo_file create_file_perms;`