From 315954b5ddca21273ccc0652051ad3d5db3caf13 Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <akoskovich@pm.me>
Date: Wed, 1 Jun 2022 17:06:06 -0700
Subject: [PATCH] lemonadep: Update from OOS 11.C.61

Change-Id: Ib782386195da04e7bb3146a0dbe581a2db41195e
---
 audio/audio_platform_info_intcodec.xml |  1 -
 audio/mixer_paths.xml                  | 12 ++++++------
 lineage_lemonadep.mk                   |  8 ++++----
 proprietary-files.txt                  |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml
index 9b96465..92ac43a 100644
--- a/audio/audio_platform_info_intcodec.xml
+++ b/audio/audio_platform_info_intcodec.xml
@@ -187,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"/>
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index d4c4a57..f0327cc 100644
--- 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_lemonadep.mk b/lineage_lemonadep.mk
index 2de39a1..98a27ee 100644
--- a/lineage_lemonadep.mk
+++ b/lineage_lemonadep.mk
@@ -26,8 +26,8 @@ PRODUCT_SYSTEM_DEVICE := OnePlus9Pro
 PRODUCT_GMS_CLIENTID_BASE := android-oneplus
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="OnePlus9Pro-user 12 SKQ1.210216.001 R.202204081955 release-keys" \
-    TARGET_DEVICE=OnePlus9Pro \
-    TARGET_PRODUCT=OnePlus9Pro
+    PRIVATE_BUILD_DESC="OnePlus9Pro-user 12 RKQ1.211119.001 R.202206101631 release-keys" \
+    TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
+    TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
 
-BUILD_FINGERPRINT := OnePlus/OnePlus9Pro/OnePlus9Pro:12/SKQ1.210216.001/R.202204081955:user/release-keys
+BUILD_FINGERPRINT := OnePlus/OnePlus9Pro/OnePlus9Pro:12/RKQ1.211119.001/R.202206101631:user/release-keys
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 6591cd5..4650778 100644
--- 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 Pro (LE2125_11.C.48).
+# are from OnePlus 9 Pro (LE2125_11.C.61).
 
 # ACDB
 odm/etc/acdbdata/Audio_Parameter_Version.txt