cupid: Include MiuiCamera if exists

Change-Id: I3169028cd45f209cf9a6c8c8d0bd5b13e7670083

BoardConfig.mk

@@ -10,9 +10,13 @@ include device/xiaomi/sm8450-common/BoardConfigCommon.mk
 # Inherit from the proprietary version
 include vendor/xiaomi/cupid/BoardConfigVendor.mk
 
+# MiuiCamera
+-include device/xiaomi/miuicamera-cupid/BoardConfig.mk
+
 DEVICE_PATH := device/xiaomi/cupid
 
 # Audio
+AUDIO_FEATURE_ENABLED_CIRRUS_CALIBRATION_RESISTANCE := true
 AUDIO_FEATURE_ENABLED_ULTRASOUND_PROXIMITY := true
 
 # Properties
@@ -20,7 +24,7 @@ TARGET_SYSTEM_PROP += $(DEVICE_PATH)/properties/system.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/properties/vendor.prop
 
 # Security patch level
-VENDOR_SECURITY_PATCH := 2025-06-05
+VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
 
 # Screen density
 TARGET_SCREEN_DENSITY := 380

audio/resourcemanager_waipio_mtp.xml

@@ -213,6 +213,10 @@
             </usecase>
             <usecase>
                 <name>PAL_STREAM_DEEP_BUFFER</name>
+                <custom-config key="camcorder_landscape">
+                    <channels>4</channels>
+                    <snd_device_name>handset-stereo-dmic-ef</snd_device_name>
+                </custom-config>
             </usecase>
             <usecase>
                 <name>PAL_STREAM_VOIP_TX</name>

audio/usecaseKvManager.xml

@@ -850,6 +850,12 @@
                 <!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_PRO -->
                 <graph_kv key="0xAD000000" value="0xAD000004"/>
             </keys_and_values>
+            <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER" CustomConfig="camcorder_landscape">
+                <!-- DEVICETX - HANDSETMIC -->
+                <graph_kv key="0xA3000000" value="0xA3000004"/>
+                <!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_SMECNS -->
+                <graph_kv key="0xAD000000" value="0xAD000002"/>
+            </keys_and_values>
             <keys_and_values StreamType="PAL_STREAM_VOICE_CALL">
                 <!-- DEVICETX - HANDSETMIC -->
                 <graph_kv key="0xA3000000" value="0xA3000004"/>
@@ -929,6 +935,12 @@
                 <!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_PRO -->
                 <graph_kv key="0xAD000000" value="0xAD000004"/>
             </keys_and_values>
+            <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER" CustomConfig="camcorder_landscape">
+                <!-- DEVICETX - SPEAKER_MIC -->
+                <graph_kv key="0xA3000000" value="0xA3000001"/>
+                <!-- DEVICEPP_TX - DEVICEPP_TX_RECORDING_DUALADC -->
+                <graph_kv key="0xAD000000" value="0xAD000072"/>
+            </keys_and_values>
             <keys_and_values StreamType="PAL_STREAM_VOICE_CALL">
                 <!-- DEVICETX - SPEAKER_MIC -->
                 <graph_kv key="0xA3000000" value="0xA3000001"/>

device.mk

@@ -10,6 +10,11 @@ $(call inherit-product, device/xiaomi/sm8450-common/common.mk)
 # Inherit from the proprietary version
 $(call inherit-product, vendor/xiaomi/cupid/cupid-vendor.mk)
 
+
+# Call the MiuiCamera setupAdd commentMore actions
+$(call inherit-product-if-exists, device/xiaomi/miuicamera-cupid/device.mk)
+$(call soong_config_set,camera,package_name,com.android.camera)
+
 # Audio
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/mixer_paths_waipio_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_taro/mixer_paths_waipio_mtp.xml \

lineage_cupid.mk

@@ -17,8 +17,8 @@ PRODUCT_BRAND := Xiaomi
 PRODUCT_MODEL := Xiaomi 12
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="cupid_global-user 15 AQ3A.241006.001 OS2.0.3.0.VLCMIXM release-keys" \
-    BuildFingerprint=Xiaomi/cupid_global/cupid:15/AQ3A.241006.001/OS2.0.3.0.VLCMIXM:user/release-keys \
+    BuildDesc="cupid_global-user 15 AQ3A.241006.001 OS2.0.4.0.VLCMIXM release-keys" \
+    BuildFingerprint=Xiaomi/cupid_global/cupid:15/AQ3A.241006.001/OS2.0.4.0.VLCMIXM:user/release-keys \
     DeviceProduct=cupid \
     SystemName=cupid_global
 

proprietary-files.txt

@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from cupid OS2.0.3.0.VLCMIXM
+# All unpinned blobs below are extracted from cupid OS2.0.4.0.VLCMIXM
 
 # ACDB
 vendor/etc/acdbdata/Forte_elus/Forte_elus_acdb_cal.acdb:vendor/etc/acdbdata/waipio_mtp/Forte_elus_acdb_cal.acdb

proprietary-firmware.txt

@@ -1,5 +1,5 @@
 ## All proprietary files from this list, unless pinned and noted otherwise,
-## are from cupid OS2.0.3.0.VLCMIXM
+## are from cupid OS2.0.4.0.VLCMIXM
 
 abl.img;AB
 aop.img;AB

remove_packages/Android.mk

@@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_OVERRIDES_PACKAGES := Email Exchange Exchange2 UnifiedEmail PhotoTable Eleven
 LOCAL_OVERRIDES_PACKAGES += PlayAutoInstallConfig RecorderPrebuilt RecorderPrebuilt_630544637
-LOCAL_OVERRIDES_PACKAGES += TipsPrebuilt Drive Tycho VoiceAccessPrebuilt
+LOCAL_OVERRIDES_PACKAGES += TipsPrebuilt Drive Tycho VoiceAccessPrebuilt Aperture
 LOCAL_UNINSTALLABLE_MODULE := true
 LOCAL_CERTIFICATE := platform
 include $(BUILD_PREBUILT)