vermeer: Add mi_tuning camera blobs for cn model

Change-Id: I4b2c30b3623ad85910da350cdd16eb4da38f9549
Signed-off-by: Lunark :3 <jvillaltamatos3007@gmail.com>

Android.bp

@@ -11,5 +11,5 @@ install_symlink {
     name: "firmware_aw_cali.bin_symlink",
     vendor: true,
     installed_location: "firmware/aw_cali.bin",
-    symlink_target: "/mnt/vendor/persist/audio/aw_cali.bin",
+    symlink_target: "/mnt/vendor/persist/audio/aw_calr.bin",
 }

configs/audio/mixer_paths_kalama_mtp.xml

@@ -302,7 +302,7 @@
         <ctl name="TX SMIC MUX2" value="SWR_MIC4" />
         <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
         <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" />
-        <ctl name="ADC1 Volume" value="5" />
+        <ctl name="ADC1 Volume" value="8" />
         <ctl name="TX1 MODE" value="ADC_LP" />
         <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="AMIC1_MIXER Switch" value="1" />

device.mk

@@ -5,6 +5,7 @@
 #
 
 # Inherit from xiaomi sm8550-common
+TARGET_HAS_UDFPS := true
 $(call inherit-product, device/xiaomi/sm8550-common/common.mk)
 
 # Inherit from the proprietary version
@@ -18,14 +19,15 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/audio/mixer_paths_kalama_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/mixer_paths_kalama_mtp.xml \
     $(LOCAL_PATH)/configs/audio/resourcemanager_kalama_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_kalama/resourcemanager_kalama_mtp.xml
 
-# IFAAService
+# Init
-PRODUCT_PACKAGES += \
+PRODUCT_COPY_FILES += \
-    IFAAService
+    $(LOCAL_PATH)/init/init.vermeer.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vermeer.rc
 
 # Overlay
 PRODUCT_PACKAGES += \
     ApertureResVermeer \
     FrameworkResOverlayVermeer \
+    NfcOverlayVermeer \
     SettingsOverlayVermeer \
     SettingsOverlayVermeerPOCO \
     SettingsOverlayVermeerRedmi \

extract-files.py

@@ -62,7 +62,8 @@ blob_fixups: blob_fixups_user_type = {
         .clear_symbol_version('AHardwareBuffer_lock')
         .clear_symbol_version('AHardwareBuffer_release')
         .clear_symbol_version('AHardwareBuffer_unlock'),
-    'odm/lib64/libTrueSight.so': blob_fixup()
+    ('odm/lib64/libAncHumanVideoBokehV4.so',
+     'odm/lib64/libTrueSight.so'): blob_fixup()
         .clear_symbol_version('AHardwareBuffer_allocate')
         .clear_symbol_version('AHardwareBuffer_describe')
         .clear_symbol_version('AHardwareBuffer_isSupported')
@@ -70,21 +71,29 @@ blob_fixups: blob_fixups_user_type = {
         .clear_symbol_version('AHardwareBuffer_lockPlanes')
         .clear_symbol_version('AHardwareBuffer_release')
         .clear_symbol_version('AHardwareBuffer_unlock'),
-    'odm/lib64/libMiVideoFilter.so': blob_fixup()
+    'odm/lib64/libMiPhotoFilter.so': blob_fixup()
         .clear_symbol_version('AHardwareBuffer_allocate')
         .clear_symbol_version('AHardwareBuffer_describe')
+        .clear_symbol_version('AHardwareBuffer_isSupported')
         .clear_symbol_version('AHardwareBuffer_lockPlanes')
         .clear_symbol_version('AHardwareBuffer_release')
         .clear_symbol_version('AHardwareBuffer_unlock'),
     'odm/lib64/libmorpho_ubwc.so': blob_fixup()
         .clear_symbol_version('AHardwareBuffer_describe'),
-    'odm/lib64/libwrapper_dlengine.so': blob_fixup()
+    ('odm/lib64/libwrapper_dlengine.so',
+     'vendor/lib64/libsnpe_config.so'): blob_fixup()
         .add_needed('liblog.so'),
     'odm/lib64/hw/camera.xiaomi.so': blob_fixup()
         .add_needed('libprocessgroup_shim.so')
         .replace_needed('libui.so', 'libui-v34.so'),
     'odm/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so': blob_fixup()
-        .binary_regex_replace(b'_ZN13DisplayConfig10ClientImpl13ClientImplGetENSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPNS_14ConfigCallbackE', sensor_simbol)
+        .replace_needed('libtinyxml2.so', 'libtinyxml2-v34.so')
+        .binary_regex_replace(b'_ZN13DisplayConfig10ClientImpl13ClientImplGetENSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEPNS_14ConfigCallbackE', sensor_simbol),
+    ('odm/bin/hw/vendor.qti.camera.provider-service_64',
+     'odm/lib64/camx.provider-impl.so',
+     'odm/lib64/com.qti.feature2.anchorsync.so',
+     'odm/lib64/camera/plugins/com.xiaomi.plugin.anchor.so'): blob_fixup()
+        .replace_needed('libtinyxml2.so', 'libtinyxml2-v34.so'),
 }
 
 module = ExtractUtilsModule(

init/init.vermeer.rc

@@ -0,0 +1,6 @@
+service citsensor-hal-2-0 /odm/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service
+    class late_start
+    user system
+    group system input
+    override
+    task_profiles ServiceCapacityLow

lineage_vermeer.mk

@@ -23,4 +23,4 @@ PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildFingerprint=POCO/vermeer_global/vermeer:15/AQ3A.240912.001/OS2.0.207.0.VNKMIXM:user/release-keys
+    BuildFingerprint=POCO/vermeer_global/vermeer:16/BP2A.250605.031.A3/OS3.0.301.0.WNKMIXM:user/release-keys

overlay/FrameworkResOverlayVermeer/res/values/config.xml

@@ -494,11 +494,4 @@
         black in software (to avoid aliasing or emulate a cutout that is not physically existent).
         -->
     <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
-
-    <!-- Whether to enable fp unlock when screen turns off on udfps devices -->
-    <bool name="config_screen_off_udfps_enabled">true</bool>
-
-    <!-- Default value for fp screen off unlock toggle, it only works for the devices that support
-         fp screen off unlock-->
-    <bool name="config_screen_off_udfps_default_on">true</bool>
 </resources>

overlay/NfcOverlayVermeer/Android.bp

@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2024 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "NfcOverlayVermeer",
+    vendor: true,
+}

overlay/NfcOverlayVermeer/AndroidManifest.xml

@@ -0,0 +1,11 @@
+<!--
+     Copyright (C) 2024 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.nfc.overlay.mondrian">
+    <overlay android:targetPackage="com.android.nfc"
+                   android:targetName="NfcCustomization"
+                   android:isStatic="true"
+                   android:priority="700"/>
+</manifest>

overlay/NfcOverlayVermeer/res/values/config.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- List of SKUs where Secure NFC functionality is supported -->
+    <string-array name="config_skuSupportsSecureNfc" translatable="false">
+        <item>vermeer</item>
+    </string-array>
+</resources>

overlay/SettingsProviderResVermeer/Android.bp

@@ -0,0 +1,18 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsProviderResVermeerPOCO",
+    manifest: "AndroidManifest-POCO.xml",
+    resource_dirs: ["res-POCO"],
+    vendor: true,
+}
+
+runtime_resource_overlay {
+    name: "SettingsProviderResVermeerRedmi",
+    manifest: "AndroidManifest-Redmi.xml",
+    resource_dirs: ["res-Redmi"],
+    vendor: true,
+}

overlay/SettingsProviderResVermeerPOCO/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "SettingsProviderResVermeerPOCO",
-    device_specific: true,
-}

overlay/SettingsProviderResVermeerRedmi/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "SettingsProviderResVermeerRedmi",
-    device_specific: true,
-}

overlay/SystemUIOverlayVermeer/res/values/config.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Maximum number of notification icons shown on the Always on Display
+        (excluding overflow dot) -->
+    <integer name="max_notif_icons_on_aod">4</integer>
+    <!-- Maximum number of notification icons shown on the lockscreen (excluding overflow dot) -->
+    <integer name="max_notif_icons_on_lockscreen">4</integer>
+    <!-- Maximum number of notification icons shown in the status bar (excluding overflow dot) -->
+    <integer name="max_notif_static_icons">5</integer>
+</resources>

overlay/WifiResVermeer/Android.bp

@@ -0,0 +1,18 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "WifiResVermeerPOCO",
+    manifest: "AndroidManifest-POCO.xml",
+    resource_dirs: ["res-POCO"],
+    vendor: true,
+}
+
+runtime_resource_overlay {
+    name: "WifiResVermeerRedmi",
+    manifest: "AndroidManifest-Redmi.xml",
+    resource_dirs: ["res-Redmi"],
+    vendor: true,
+}

overlay/WifiResVermeerPOCO/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "WifiResVermeerPOCO",
-    device_specific: true,
-}

overlay/WifiResVermeerRedmi/Android.bp

@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "WifiResVermeerRedmi",
-    device_specific: true,
-}

proprietary-files.txt

@@ -1,18 +1,18 @@
 ## All proprietary files from this list, unless pinned and noted otherwise,
-## are taken from POCO F6 Pro / Redmi K70 AQ3A.240912.001 OS2.0.207.0.VNKMIXM
+## are taken from POCO F6 Pro / Redmi K70 BP2A.250605.031.A3 OS3.0.301.0.WNKMIXM
 
 # ACDBs
 odm/etc/acdbdata/Tutu/Tutu_acdb_cal.acdb:vendor/etc/acdbdata/kalama_mtp/Tutu_acdb_cal.acdb
 odm/etc/acdbdata/Tutu/Tutu_workspaceFileXml.qwsp:vendor/etc/acdbdata/kalama_mtp/Tutu_workspaceFileXml.qwsp
 
 # ADSP Modules
-odm/lib/rfsa/adsp/libarcsoft_beauty_hvx_skel.so
-odm/lib/rfsa/adsp/libmialgo_mc_bokeh_cdsp_skel.so
-odm/lib/rfsa/adsp/libmialgo_rawhdr_cdsp_skel.so
 odm/lib/rfsa/adsp/libaisupernight_ellc_cdsp_skel.so
+odm/lib/rfsa/adsp/libarcsoft_beauty_hvx_skel.so
 odm/lib/rfsa/adsp/libmialgo_ai_process_cdsp_skel.so
 odm/lib/rfsa/adsp/libmialgo_bokeh_depth_cdsp_skel.so
 odm/lib/rfsa/adsp/libmialgo_ell_cdsp_skel.so
+odm/lib/rfsa/adsp/libmialgo_mc_bokeh_cdsp_skel.so
+odm/lib/rfsa/adsp/libmialgo_rawhdr_cdsp_skel.so
 odm/lib/rfsa/adsp/libmialgo_supernight_capture_cdsp_skel.so
 odm/mount/camera/lib/rfsa/adsp/bm3a68v08s11n29.bin:vendor/lib/rfsa/adsp/bm3a68v08s11n29.bin
 odm/mount/camera/lib/rfsa/adsp/bm3a68v08s11n30.bin:vendor/lib/rfsa/adsp/bm3a68v08s11n30.bin
@@ -69,7 +69,7 @@ odm/mount/camera/lib/rfsa/adsp/bm3a73v08s11n63.bin:vendor/lib/rfsa/adsp/bm3a73v0
 odm/mount/camera/lib/rfsa/adsp/libCalculator_skel.so:vendor/lib/rfsa/adsp/libCalculator_skel.so
 odm/mount/camera/lib/rfsa/adsp/libQnnHtpV73.so:vendor/lib/rfsa/adsp/libQnnHtpV73.so
 odm/mount/camera/lib/rfsa/adsp/libQnnHtpV73Skel.so:vendor/lib/rfsa/adsp/libQnnHtpV73Skel.so
-odm/mount/camera/lib/rfsa/adsp/libQnnSaver.so:vendor/lib/rfsa/adsp/libQnnSaver.so;MODULE_SUFFIX=_adsp
+odm/mount/camera/lib/rfsa/adsp/libQnnSaver.so:vendor/lib/rfsa/adsp/libQnnSaver.so
 odm/mount/camera/lib/rfsa/adsp/libSnpeDspV65Skel.so:vendor/lib/rfsa/adsp/libSnpeDspV65Skel.so
 odm/mount/camera/lib/rfsa/adsp/libSnpeDspV66Skel.so:vendor/lib/rfsa/adsp/libSnpeDspV66Skel.so
 odm/mount/camera/lib/rfsa/adsp/libSnpeHtpV68Skel.so:vendor/lib/rfsa/adsp/libSnpeHtpV68Skel.so
@@ -86,10 +86,10 @@ odm/mount/camera/lib/rfsa/adsp/libhdr_cdsp_skel.so:vendor/lib/rfsa/adsp/libhdr_c
 odm/mount/camera/lib/rfsa/adsp/libhdr_skel.so:vendor/lib/rfsa/adsp/libhdr_skel.so
 odm/mount/camera/lib/rfsa/adsp/libmctfengine_skel.so:vendor/lib/rfsa/adsp/libmctfengine_skel.so
 odm/mount/camera/lib/rfsa/adsp/libmialgo_basic_cdsp_skel.so:vendor/lib/rfsa/adsp/libmialgo_basic_cdsp_skel.so
+odm/mount/camera/lib/rfsa/adsp/libmialgo_bokeh_effect_cdsp_skel.so:vendor/lib/rfsa/adsp/libmialgo_bokeh_effect_cdsp_skel.so
 odm/mount/camera/lib/rfsa/adsp/libmialgo_ldc_cdsp_skel.so:vendor/lib/rfsa/adsp/libmialgo_ldc_cdsp_skel.so
 odm/mount/camera/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so:vendor/lib/rfsa/adsp/libmialgo_rfs_cdsp_skel.so
 odm/mount/camera/lib/rfsa/adsp/libmialgo_slow_motion_cdsp_skel.so:vendor/lib/rfsa/adsp/libmialgo_slow_motion_cdsp_skel.so
-odm/mount/camera/lib/rfsa/adsp/libmialgo_bokeh_effect_cdsp_skel.so:vendor/lib/rfsa/adsp/libmialgo_bokeh_effect_cdsp_skel.so
 vendor/lib/rfsa/adsp/capi_cirrus_sp.so
 vendor/lib/rfsa/adsp/chre_qsh_shim.so
 vendor/lib/rfsa/adsp/hrtf5c.bin
@@ -118,7 +118,7 @@ vendor/lib/rfsa/adsp/libvpp_frc.so
 vendor/lib/rfsa/adsp/libvpp_svc_skel.so
 vendor/lib/rfsa/adsp/libvpp_vqa_networks.so
 vendor/lib/rfsa/adsp/libvpt_action_recognition.so
-vendor/lib/rfsa/adsp/nearby.napp_header;MODULE=nearby.napp_header
+vendor/lib/rfsa/adsp/nearby.napp_header
 vendor/lib/rfsa/adsp/nearby.so
 
 # Audio firmware
@@ -445,13 +445,40 @@ odm/etc/camera/resources/render/GlobalConfig.json
 odm/etc/camera/resources/default_param.json
 odm/etc/camera/resources/truesight_param.json
 odm/etc/camera/resources/truesight_param_debug.json
+odm/etc/camera/videofilter/102_SummerDay.png
+odm/etc/camera/videofilter/103_Fantasy.png
+odm/etc/camera/videofilter/104_Meet.png
+odm/etc/camera/videofilter/105_WindSing.png
+odm/etc/camera/videofilter/106_Lost.png
+odm/etc/camera/videofilter/107_Central.png
+odm/etc/camera/videofilter/108_NorthernEurope.png
+odm/etc/camera/videofilter/109_Rome.png
 odm/etc/camera/videofilter/110_BlackGold.png
+odm/etc/camera/videofilter/111_GreenOrange.png
+odm/etc/camera/videofilter/112_CyberPunk.png
+odm/etc/camera/videofilter/113_BlackIce.png
+odm/etc/camera/videofilter/121_Bleach.png
+odm/etc/camera/videofilter/122_Thriller.png
+odm/etc/camera/videofilter/123_TealOrange.png
+odm/etc/camera/videofilter/124_JapaneseStyle.png
+odm/etc/camera/videofilter/125_Latin.png
+odm/etc/camera/videofilter/126_Fantasy2.png
+odm/etc/camera/videofilter/127_Creamy.png
+odm/etc/camera/videofilter/128_Sepia.png
 odm/etc/camera/videofilter/129_LeicaVivid.png
 odm/etc/camera/videofilter/130_LeicaNatural.png
 odm/etc/camera/videofilter/131_MonochromeTrue.png
 odm/etc/camera/videofilter/132_MonochromeHighContrast.png
 odm/etc/camera/videofilter/133_MonochromeBrown.png
 odm/etc/camera/videofilter/134_MonochromeBlue.png
+odm/etc/camera/videofilter/135_Classical.png
+odm/etc/camera/videofilter/136_Filene.png
+odm/etc/camera/videofilter/137_GreenNight.png
+odm/etc/camera/videofilter/138_LiteratureAndArt.png
+odm/etc/camera/videofilter/139_OrangeHoney.png
+odm/etc/camera/videofilter/140_Romance.png
+odm/etc/camera/videofilter/141_FR500.png
+odm/etc/camera/videofilter/142_FE250.png
 odm/etc/camera/videofilter/144_RedHero.png
 odm/etc/camera/videofilter/146_TactileGreen.png
 odm/etc/camera/videofilter/148_Mild.png
@@ -536,7 +563,9 @@ odm/etc/camera/beauty_config_gl.json
 odm/etc/camera/beauty_config_gl_8g.json
 odm/etc/camera/beauty_style_nude.cng
 odm/etc/camera/bokehParams.json
-odm/etc/camera/camerabooster.json
+odm/etc/camera/cameracustomize.json
+odm/etc/camera/cameradfx_config.json
+odm/etc/camera/cameraopt_reclaim.json
 odm/etc/camera/camxoverridesettings.txt
 odm/etc/camera/com.xiaomi.dcal.wu.golden
 odm/etc/camera/com.xiaomi.dcal.wu.golden2
@@ -672,16 +701,17 @@ odm/lib64/com.qualcomm.mcx.nonlinearmapper.so
 odm/lib64/com.qualcomm.mcx.policy.mfl.so
 odm/lib64/com.qualcomm.mcx.policy.xr.so
 odm/lib64/com.qualcomm.qti.mcx.usecase.extension.so
+odm/lib64/com.xiaomi.camdfx.so
 odm/lib64/com.xiaomi.camhal.overlap.so
 odm/lib64/com.xiaomi.camhal.submodel.camxfrag.so
 odm/lib64/com.xiaomi.camhal.submodel.chifrag.so
 odm/lib64/com.xiaomi.drivermqs.so
 odm/lib64/com.xiaomi.immunesystem.so
 odm/lib64/libAF.so
-odm/lib64/libAncHumanVideoBokehV4.so;DISABLE_CHECKELF
+odm/lib64/libAncHumanVideoBokehV4.so
 odm/lib64/libHISCppAlgos.so
 odm/lib64/libMiMotion.so
-odm/lib64/libMiVideoFilter.so
+odm/lib64/libMiPhotoFilter.so
 odm/lib64/libTrueSight.so
 odm/lib64/libXMFaceFocus.so
 odm/lib64/libaidenoiser.so
@@ -804,7 +834,6 @@ odm/lib64/libmmcamera_mfnr_t4.so
 odm/lib64/libmmcamera_pdpc.so
 odm/lib64/libmorpho_ubwc.so
 odm/lib64/libmorpho_video_stabilizer.so
-odm/lib64/libsdr2hdr.so
 odm/lib64/libmpbase.so
 odm/lib64/libofflinedebugdata.so
 odm/lib64/libofflinefeatureintf.so
@@ -822,6 +851,7 @@ odm/lib64/librawnrv2_shared.so
 odm/lib64/libremosaic_wrapper.so
 odm/lib64/libremosaiclib.so
 odm/lib64/librfs_warp.so
+odm/lib64/libsdr2hdr.so
 odm/lib64/libsfeShiftExtrapolation.so
 odm/lib64/libshadowhook.so
 odm/lib64/libsupermoon.so
@@ -872,22 +902,22 @@ vendor/lib64/libbitmlenginev2.so
 vendor/lib64/libcalculator.so
 vendor/lib64/libcalculator_htp.so
 vendor/lib64/libcamxexternalformatutils.so
+vendor/lib64/libeyecare.so
 vendor/lib64/libhta_hexagon_runtime_snpe.so
+vendor/lib64/libmi-stc-HW-modulate.so
+vendor/lib64/libmiSensorCtrl.so
+vendor/lib64/libmi_dspp.so
 vendor/lib64/libmicuttlefish_fs.so
 vendor/lib64/libmivsock_utils.so
 vendor/lib64/libos.so
-vendor/lib64/libmi-stc-HW-modulate.so
-vendor/lib64/libmiSensorCtrl.so
-vendor/lib64/libeyecare.so 
 vendor/lib64/libquickcamera.so
-vendor/lib64/libsnpe_config.so;DISABLE_CHECKELF
+vendor/lib64/libsnpe_config.so
 vendor/lib64/libsynx.so
 vendor/lib64/libthreadutils.so
-vendor/lib64/libmi_dspp.so
+vendor/lib64/vendor.xiaomi.hardware.aon-V1-ndk.so
 vendor/lib64/vendor.xiaomi.hardware.bgservice@1.0.so
 vendor/lib64/vendor.xiaomi.hardware.miface@1.0.so
 vendor/lib64/vendor.xiaomi.hardware.quickcamera@1.0.so
-vendor/lib64/vendor.xiaomi.hardware.aon-V1-ndk.so
 
 # Camera components
 odm/lib64/camera/components/com.bots.node.vendortagwrite.so
@@ -1041,11 +1071,8 @@ odm/lib64/camera/com.qti.tuned.vermeer_aac_gc16b3_front_ii.bin
 odm/lib64/camera/com.qti.tuned.vermeer_aac_ov16a1q_front.bin
 odm/lib64/camera/com.qti.tuned.vermeer_aac_ovx8000_wide_ii.bin
 odm/lib64/camera/com.qti.tuned.vermeer_ofilm_gc02m1_macro.bin
-odm/lib64/camera/com.qti.tuned.vermeer_ofilm_gc02m1_macro_light_ii.bin|00b0c97c79528c69616783ea75a7cfb2024241a2
 odm/lib64/camera/com.qti.tuned.vermeer_ofilm_imx355_ultra.bin
-odm/lib64/camera/com.qti.tuned.vermeer_ofilm_imx355_ultra_light_ii.bin|3ecad4978b6bff03e596c3c68e9aa5d5d69b3e0e
 odm/lib64/camera/com.qti.tuned.vermeer_ofilm_ovx8000_wide_i.bin
-odm/lib64/camera/com.qti.tuned.vermeer_ofilm_ovx8000_wide_i_light_ii.bin|b5082f05a336240252c0711e9533250a05e3de89
 odm/lib64/camera/fdconfigpreview.bin
 odm/lib64/camera/fdconfigpreviewlite.bin
 odm/lib64/camera/fdconfigsecure.bin
@@ -1053,6 +1080,14 @@ odm/lib64/camera/fdconfigvideo.bin
 odm/lib64/camera/fdconfigvideolite.bin
 odm/lib64/camera/libchxlogicalcameratable.so
 
+# Camera - Redmi K70 OS3.0.303.0.WNKCNXM
+odm/etc/camera/mi_tuning/vermeer_ofilm_gc02m1_macro_light_ii.bin|7b7148798236ebcbc098a68c41e5b4349b36ac87
+odm/etc/camera/mi_tuning/vermeer_ofilm_imx355_ultra_light_ii.bin|afcdb9e61661efbb3d79d19322c74bbb6442ab2b
+odm/etc/camera/mi_tuning/vermeer_ofilm_ovx8000_wide_i_light_ii.bin|a8eb43601bed1190a744a3d10635fcc8a8cc04f1
+odm/lib64/camera/com.qti.tuned.vermeer_ofilm_gc02m1_macro_light_ii.bin|00b0c97c79528c69616783ea75a7cfb2024241a2
+odm/lib64/camera/com.qti.tuned.vermeer_ofilm_imx355_ultra_light_ii.bin|3ecad4978b6bff03e596c3c68e9aa5d5d69b3e0e
+odm/lib64/camera/com.qti.tuned.vermeer_ofilm_ovx8000_wide_i_light_ii.bin|b982058a91ff749b156de472aa8d198c0b60f6ba
+
 # Camera Firmware
 odm/firmware/CAMERA_ICP.b00
 odm/firmware/CAMERA_ICP.b01
@@ -1086,13 +1121,12 @@ odm/etc/mdss_dsi_n11_42_02_0a_dsc_cmd_mi.xml
 
 # Display (Config)
 product/etc/displayconfig/display_id_4630946738963277955.xml:vendor/etc/displayconfig/display_id_4630946738963277955.xml
-vendor/etc/clstc_config_library.xml
 vendor/etc/display/3dlut-pt-onnx-ptq-htp-fp16.dlc
 vendor/etc/displayconfig/display_layout_configuration.xml
+vendor/etc/clstc_config_library.xml
 vendor/etc/snapdragon_color_libs_config.xml
 
 # Display calibration data
-odm/etc/df_default.xml
 odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/cct_pcc.txt
 odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/miLutInfo.txt
 odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/miLut_0.txt
@@ -1120,6 +1154,7 @@ odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/mi_gc_0.txt
 odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/mi_gc_1.txt
 odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/mi_gc_2.txt
 odm/etc/disp0/mdss_dsi_n11_42_02_0a_dsc_cmd/mi_gc_3.txt
+odm/etc/df_default.xml
 vendor/etc/df_default.xml
 
 # Fingerprint
@@ -1197,14 +1232,15 @@ vendor/etc/sensors/sns_reg_config
 
 # Sensors (CIT)
 odm/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service
+odm/etc/cit_param_config.json
 odm/etc/init/vendor.xiaomi.sensor.citsensorservice@2.0-service.rc
 odm/etc/vintf/manifest/vendor.xiaomi.sensor.citsensorservice@2.0-service.xml
 odm/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so
 
 # Sensors - SSC calibration
-odm/lib64/libssccalapi@2.0.so
 odm/lib64/libclient2slpi.notifier.so
 odm/lib64/libsensor_cal@2.0.so
+odm/lib64/libssccalapi@2.0.so
 
 # Sensor Communicate
 odm/bin/hw/vendor.xiaomi.sensor.communicate@1.0-service

sepolicy/vendor/hal_citsensorservice_xiaomi.te

@@ -26,7 +26,6 @@ allow vendor_hal_citsensorservice_xiaomi_default vendor_sysfs_displayfeature:fil
 allow vendor_hal_citsensorservice_xiaomi_default vendor_displayfeature_device:chr_file { ioctl open read write };
 allow vendor_hal_citsensorservice_xiaomi_default hal_graphics_mapper_hwservice:hwservice_manager find;
 allow vendor_hal_citsensorservice_xiaomi_default vendor_hal_display_config_hwservice:hwservice_manager find;
-allow vendor_hal_citsensorservice_xiaomi_default vendor_hal_display_config_hwservice:binder { call transfer };
 allow vendor_hal_citsensorservice_xiaomi_default vendor_hal_display_config_hwservice:fd *;
 allow vendor_hal_citsensorservice_xiaomi_default hal_graphics_composer:binder { call transfer };
 allow vendor_hal_citsensorservice_xiaomi_default hal_graphics_composer:fd *;

sepolicy/vendor/hal_display_config.te

@@ -1 +0,0 @@
-allow vendor_hal_display_config_hwservice vendor_hal_citsensorservice_xiaomi_default:binder transfer;