From 8c09ec8bbf9da517afc22c244a8146b9e6becdab Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Thu, 31 Aug 2023 23:11:12 -0600
Subject: [PATCH] rtwo: Switch blobs to RETUS

Some edge+ users are saying that WiFi won't work for them using RETAIL or RETEU blobs,
so let's switch to RETUS blobs as other variants still work on those

Change-Id: Ied686675a08c4c8a8295e30e6c19dca4bfddf0b6
---
 audio/sku_kalama/audio_policy_configuration.xml      | 6 ------
 audio/sku_kalama_qssi/audio_policy_configuration.xml | 6 ------
 lineage_rtwo.mk                                      | 6 +++---
 proprietary-files.txt                                | 4 +++-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/audio/sku_kalama/audio_policy_configuration.xml b/audio/sku_kalama/audio_policy_configuration.xml
index ee39437..d5f1a25 100644
--- a/audio/sku_kalama/audio_policy_configuration.xml
+++ b/audio/sku_kalama/audio_policy_configuration.xml
@@ -108,12 +108,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                         flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="hifi_playback" role="source" />
                 <mixPort name="spatial output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
diff --git a/audio/sku_kalama_qssi/audio_policy_configuration.xml b/audio/sku_kalama_qssi/audio_policy_configuration.xml
index ee39437..d5f1a25 100644
--- a/audio/sku_kalama_qssi/audio_policy_configuration.xml
+++ b/audio/sku_kalama_qssi/audio_policy_configuration.xml
@@ -108,12 +108,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                         flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="hifi_playback" role="source" />
                 <mixPort name="spatial output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
diff --git a/lineage_rtwo.mk b/lineage_rtwo.mk
index 5f39691..85c99f8 100644
--- a/lineage_rtwo.mk
+++ b/lineage_rtwo.mk
@@ -33,7 +33,7 @@ PRODUCT_MODEL := motorola edge 40 pro
 PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_PRODUCT=rtwo_ge \
-    PRIVATE_BUILD_DESC="rtwo_ge-user 13 T1TRS33.43-20-28-2 888045-8d5819 release-keys"
+    TARGET_PRODUCT=rtwo_g \
+    PRIVATE_BUILD_DESC="rtwo_g-user 13 T1TRS33.43-48-21-2 5df599e-2fca1 release-keys"
 
-BUILD_FINGERPRINT := motorola/rtwo_ge/rtwo:13/T1TRS33.43-20-28-2/888045-8d5819:user/release-keys
+BUILD_FINGERPRINT := motorola/rtwo_g/rtwo:13/T1TRS33.43-48-21-2/5df599e-2fca1:user/release-keys
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 5f96e11..f2f8c96 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from 13-T1TRS33.43-20-28-2 888045-8d5819 release-keys.
+# All unpinned blobs below are extracted from 13 T1TRS33.43-48-21-2 5df599e-2fca1 release-keys.
 
 # ACDB Data
 vendor/etc/acdbdata/ffv_models/ffv__5.0.1_0.1__3.0.0_0.0__eai_2.10_enpu3.pmd
@@ -682,6 +682,8 @@ vendor/lib64/sensors.ssc.so
 vendor/etc/sensors/als_comp_config.xml
 vendor/etc/sensors/als_comp_tf_csot.config
 vendor/etc/sensors/als_comp_tf_csot_dc.config
+vendor/etc/sensors/als_comp_tf_tianma.config
+vendor/etc/sensors/als_comp_tf_tianma_dc.config
 vendor/etc/sensors/config/bmp5_0.json
 vendor/etc/sensors/config/icp201xx_0.json
 vendor/etc/sensors/config/kailua_irq.json