lemonade: Update from OOS 11.C.61

Change-Id: Ib782386195da04e7bb3146a0dbe581a2db41195e
StagOS-Devices · Jul 23, 2022 · 905ab67 · 905ab67
1 parent 62fd0f9
commit 905ab67
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml
@@ -140,6 +140,8 @@
         <!--#Juqiang.Geng@MULTIMEDIA.AUDIODRIVER.HAL, 2020/08/24, Add for AP LVIMFS end-->
         <!--#Yongzhi.Zhang@PSW.MM.AudioDriver.HAL.413701, 2020/09/22, Add for old audiovoice scence-->
         <param key="use_audiovoice_scence" value="false"/>
+        <!--Jie.Du@MULTIMEDIA.AUDIODRIVER.HAL, 2021/01/20, add for audioscence v2-->
+        <param key="use_audiovoice_scence_v2" value="false"/>
         <!--alvin.zhang@MULTIMEDIA.AUDIODRIVER.HAL.OPLUS_FEATURE_VIBRING_SYNC, 2021/01/04, Add vibrator ring sync -->
         <param key="vibring_sync" value="true"/>
         <!--alvin.zhang@MULTIMEDIA.AUDIODRIVER.HAL.OPLUS_FEATURE_VIBRING_SYNC, 2021/01/04, Add vibrator ring sync end-->
@@ -185,7 +187,6 @@
         <!--MinYi.Hu@MULTIMEDIA.AUDIODRIVER.HAL, 2021/08/18, add for HAC-->
         <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" acdb_id="103"/>
         <device name="SND_DEVICE_IN_VOICE_HAC_HANDSET_DMIC" acdb_id="105"/>
-        <!--<device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" acdb_id="7"/>-->
         <!--MinYi.Hu@MULTIMEDIA.AUDIODRIVER.HAL, 2021/08/18, add for HAC end-->
         <!--#Jianfeng.Qiu@PSW.MM.AudioDriver.HAL, 2017/09/22, Add for oplus config-->
         <device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>
@@ -471,6 +472,9 @@
         <device name="SND_DEVICE_IN_SPEAKER_MIC_VOICE_RECORD_GAME" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_CAMCORDER_SELFIE" interface="TX_CDC_DMA_TX_3"/>
         <device name="SND_DEVICE_IN_HEADSET_MIC_LOW_LATENCY" backend="headset-mic" interface="TX_CDC_DMA_TX_4"/>
+        <!--zhangrun@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_VIDEO_SWITCH, 2021/02/22, Add for Video sound to switch START -->
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO_SWITCH" interface="TX_CDC_DMA_TX_3"/>
+        <!--zhangrun@MULTIMEDIA.AUDIODRIVER.OPLUS_FEATURE_VIDEO_SWITCH, 2021/02/22, Add for Video sound to switch END -->
     </backend_names>
     <!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
     <microphone_characteristics>

diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
@@ -563,8 +563,8 @@
     <ctl name="MultiMedia6 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia6" value="0" />
     <ctl name="HDMI Mixer MultiMedia16" value="0" />
-    <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="0" />
-    <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="0" />
+    <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode1" value="0" />
+    <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode2" value="0" />
     <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="0" />
     <ctl name="TERT_MI2S_RX Audio Mixer MultiMedia31" value="0" />
@@ -2852,7 +2852,7 @@
     </path>
 
     <path name="voicemmode1-call display-port1-and-usb-headset-mic">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode1" value="1" />
         <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
     </path>
 
@@ -2862,7 +2862,7 @@
     </path>
 
     <path name="voicemmode1-call display-port1">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode1" value="1" />
         <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
     </path>
 
@@ -2937,7 +2937,7 @@
     </path>
 
     <path name="voicemmode2-call display-port1-and-usb-headset-mic">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode2" value="1" />
         <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
     </path>
 
@@ -2947,7 +2947,7 @@
     </path>
 
     <path name="voicemmode2-call display-port1">
-        <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+        <ctl name="DISPLAY_PORT_RX1_Voice Mixer VoiceMMode2" value="1" />
         <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
     </path>
 

diff --git a/lineage_lemonade.mk b/lineage_lemonade.mk
@@ -26,8 +26,8 @@ PRODUCT_SYSTEM_DEVICE := OnePlus9
 PRODUCT_GMS_CLIENTID_BASE := android-oneplus
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="OnePlus9-user 12 SKQ1.210216.001 R.202204081955 release-keys" \
-    TARGET_DEVICE=OnePlus9 \
-    TARGET_PRODUCT=OnePlus9
+    PRIVATE_BUILD_DESC="OnePlus9-user 12 RKQ1.211119.001 R.202206101631 release-keys" \
+    TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
+    TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
 
-BUILD_FINGERPRINT := OnePlus/OnePlus9/OnePlus9:12/SKQ1.210216.001/R.202204081955:user/release-keys
+BUILD_FINGERPRINT := OnePlus/OnePlus9/OnePlus9:12/RKQ1.211119.001/R.202206101631:user/release-keys
diff --git a/proprietary-files.txt b/proprietary-files.txt
@@ -1,5 +1,5 @@
 ## All proprietary files from this list, unless pinned and noted otherwise,
-## are from OnePlus 9 (LE2115_11_C.48).
+## are from OnePlus 9 (LE2111_11.C.61).
 
 # ACDBs
 odm/etc/acdbdata/Audio_Parameter_Version.txt