From 8cd2aba4f579a8391e2a670a07fb197e06d7c29d Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Wed, 20 Dec 2023 20:35:21 +0100
Subject: [PATCH] rtwo: Update from rtwo_cn-user 14 U1TR34.8-19-2 9bfa3-adc28
 release-keys

Pin euicc, hotword and MotCamera4 (the one on retcn doesn't have Google Lens)

Also pin some CarrierConfigs that don't exist on retcn

Change-Id: Icaef3bfb9ed4c054176b7ed2b9df1efabf5dff32
---
 BoardConfig.mk                                |   2 +-
 audio/audio_policy_volumes.xml                |  12 +-
 audio/default_volume_tables.xml               |  10 +-
 .../sku_kalama/audio_policy_configuration.xml |   2 +
 .../sku_kalama/resourcemanager_kalama_mtp.xml |   9 +
 .../audio_policy_configuration.xml            |   2 +
 lineage_rtwo.mk                               |   6 +-
 media/media_profiles_kalama.xml               | 252 +++++++++++++++++-
 proprietary-files-carriersettings.txt         | 145 ++++++++--
 proprietary-files.txt                         |  80 +++---
 vendor.prop                                   |   1 +
 11 files changed, 444 insertions(+), 77 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index bf4fde1..f79594a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -109,7 +109,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
 
 # Security
-VENDOR_SECURITY_PATCH := 2023-09-01
+VENDOR_SECURITY_PATCH := 2023-11-01
 
 # inherit from the proprietary version
 include vendor/motorola/rtwo/BoardConfigVendor.mk
diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml
index ff2d5e7..9fce969 100644
--- a/audio/audio_policy_volumes.xml
+++ b/audio/audio_policy_volumes.xml
@@ -44,8 +44,16 @@ volume index from 0 to 100.
                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                        ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-6100</point>
+        <point>15,-3850</point>
+        <point>30,-2600</point>
+        <point>43,-1800</point>
+        <point>65,-900</point>
+        <point>85,-440</point>
+        <point>93,-180</point>
+        <point>100,0</point>
+    </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml
index 5b5fed7..6aa27a9 100644
--- a/audio/default_volume_tables.xml
+++ b/audio/default_volume_tables.xml
@@ -62,9 +62,13 @@
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE">
     <!-- Default is Speaker Media Volume Curve -->
-        <point>1,-5800</point>
-        <point>33,-3000</point>
-        <point>66,-1400</point>
+        <point>1,-6100</point>
+        <point>15,-3450</point>
+        <point>30,-2400</point>
+        <point>43,-1800</point>
+        <point>65,-900</point>
+        <point>85,-440</point>
+        <point>93,-180</point>
         <point>100,0</point>
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE">
diff --git a/audio/sku_kalama/audio_policy_configuration.xml b/audio/sku_kalama/audio_policy_configuration.xml
index d5f1a25..810d63e 100644
--- a/audio/sku_kalama/audio_policy_configuration.xml
+++ b/audio/sku_kalama/audio_policy_configuration.xml
@@ -99,6 +99,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST AUDIO_OUTPUT_FLAG_PRIMARY">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="haptics output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/sku_kalama/resourcemanager_kalama_mtp.xml b/audio/sku_kalama/resourcemanager_kalama_mtp.xml
index b09babd..1bf6593 100644
--- a/audio/sku_kalama/resourcemanager_kalama_mtp.xml
+++ b/audio/sku_kalama/resourcemanager_kalama_mtp.xml
@@ -707,6 +707,15 @@
             -->
             <cps_mode>2</cps_mode>
             <vbat_enabled>0</vbat_enabled>
+            <wsa2_enable>0</wsa2_enable>
+            <!--wsa registers physical addresses in decimal notation -->
+            <wsa_wr_cmd_reg_phy_addr>112279584</wsa_wr_cmd_reg_phy_addr>
+            <wsa_rd_cmd_reg_phy_addr>112279588</wsa_rd_cmd_reg_phy_addr>
+            <wsa_rd_fifo_reg_phy_addr>112279616</wsa_rd_fifo_reg_phy_addr>
+            <!--wsa2 registers physical addresses in decimal notation and to be updated only if wsa2 is enabled, else should be marked as 0-->
+            <wsa2_wr_cmd_reg_phy_addr>0</wsa2_wr_cmd_reg_phy_addr>
+            <wsa2_rd_cmd_reg_phy_addr>0</wsa2_rd_cmd_reg_phy_addr>
+            <wsa2_rd_fifo_reg_phy_addr>0</wsa2_rd_fifo_reg_phy_addr>
             <!--specify the supported bit format on speaker end point -->
             <!--this should be in the form of pal_audio_fmt_id-->
             <!--e.g <supported_bit_format >PAL_AUDIO_FMT_PCM_S24_LE</supported_bit_format>-->
diff --git a/audio/sku_kalama_qssi/audio_policy_configuration.xml b/audio/sku_kalama_qssi/audio_policy_configuration.xml
index d5f1a25..810d63e 100644
--- a/audio/sku_kalama_qssi/audio_policy_configuration.xml
+++ b/audio/sku_kalama_qssi/audio_policy_configuration.xml
@@ -99,6 +99,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST AUDIO_OUTPUT_FLAG_PRIMARY">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="haptics output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/lineage_rtwo.mk b/lineage_rtwo.mk
index 84ec292..b96aa10 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_g \
-    PRIVATE_BUILD_DESC="rtwo_g-user 13 T1TR33.43-48-41 49227-28ba2 release-keys"
+    TARGET_PRODUCT=rtwo_cn \
+    PRIVATE_BUILD_DESC="rtwo_cn-user 14 U1TR34.8-19-2 9bfa3-adc28 release-keys"
 
-BUILD_FINGERPRINT := motorola/rtwo_g/rtwo:13/T1TR33.43-48-41/49227-28ba2:user/release-keys
+BUILD_FINGERPRINT := motorola/rtwo_cn/msi:14/U1TR34.8-19-2/9bfa3-adc28:user/release-keys
diff --git a/media/media_profiles_kalama.xml b/media/media_profiles_kalama.xml
index 4ac16d6..316c233 100644
--- a/media/media_profiles_kalama.xml
+++ b/media/media_profiles_kalama.xml
@@ -27,7 +27,7 @@
 <!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
 <!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
 <!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
-<!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>
+<!ATTLIST EncoderProfile cameraId (0|1|2) #REQUIRED>
 <!ELEMENT Video EMPTY>
 <!ATTLIST Video codec (h264|h263|m4v) #REQUIRED>
 <!ATTLIST Video bitRate CDATA #REQUIRED>
@@ -564,6 +564,256 @@
 
     </CamcorderProfiles>
 
+    <CamcorderProfiles cameraId="2">
+
+    <EncoderProfile quality="low" fileFormat="3gp" duration="30">
+      <Video codec="h264"
+             bitRate="192000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <Audio codec="amrnb"
+             bitRate="12200"
+             sampleRate="8000"
+             channels="1" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="high" fileFormat="mp4" duration="30">
+      <Video codec="hevc"
+             bitRate="35000000"
+             width="3840"
+             height="2160"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="qvga" fileFormat="3gp" duration="30">
+      <Video codec="h264"
+             bitRate="192000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <Audio codec="amrnb"
+             bitRate="12200"
+             sampleRate="8000"
+             channels="1" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="2000000"
+             width="640"
+             height="480"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="14000000"
+             width="1280"
+             height="720"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="20000000"
+             width="1920"
+             height="1080"
+             frameRate="30" />
+
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
+      <Video codec="hevc"
+            bitRate="35000000"
+            width="3840"
+            height="2160"
+            frameRate="30" />
+
+      <Audio codec="aac"
+            bitRate="256000"
+            sampleRate="48000"
+            channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapselow" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="192000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="amrnb"
+             bitRate="12200"
+             sampleRate="8000"
+             channels="1" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
+      <Video codec="hevc"
+            bitRate="35000000"
+            width="3840"
+            height="2160"
+            frameRate="30" />
+
+      <Audio codec="aac"
+            bitRate="256000"
+            sampleRate="48000"
+            channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="192000"
+             width="320"
+             height="240"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="amrnb"
+             bitRate="12200"
+             sampleRate="8000"
+             channels="1" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="2000000"
+             width="640"
+             height="480"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="14000000"
+             width="1280"
+             height="720"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
+      <Video codec="h264"
+             bitRate="20000000"
+             width="1920"
+             height="1080"
+             frameRate="30" />
+
+      <!-- audio setting is ignored -->
+      <Audio codec="aac"
+             bitRate="256000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
+      <Video codec="hevc"
+            bitRate="35000000"
+            width="3840"
+            height="2160"
+            frameRate="30" />
+
+      <Audio codec="aac"
+            bitRate="256000"
+            sampleRate="48000"
+            channels="2" />
+    </EncoderProfile>
+
+    <!-- CAMCORDER_QUALITY_HIGH_SPEED_LOW/720P : 720p@240fps; 55.0 Mbps -->
+    <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="30">
+        <Video codec="h264"
+              bitRate="55000000"
+              width="1280"
+              height="720"
+              frameRate="240" />
+        <!-- audio setting is ignored -->
+        <Audio codec="aac"
+             bitRate="96000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <!-- CAMCORDER_QUALITY_HIGH_SPEED_HIGH/1080P : 1080p@240fps; 80.0 Mbps -->
+    <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
+        <Video codec="h264"
+              bitRate="80000000"
+              width="1920"
+              height="1080"
+              frameRate="240" />
+        <!-- audio setting is ignored -->
+        <Audio codec="aac"
+             bitRate="96000"
+             sampleRate="48000"
+             channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
+        <Video codec="h264"
+              bitRate="55000000"
+              width="1280"
+              height="720"
+              frameRate="240" />
+        <!-- audio setting is ignored -->
+        <Audio codec="aac"
+              bitRate="96000"
+              sampleRate="48000"
+              channels="2" />
+    </EncoderProfile>
+
+    <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
+        <Video codec="h264"
+              bitRate="80000000"
+              width="1920"
+              height="1080"
+              frameRate="240" />
+        <!-- audio setting is ignored -->
+        <Audio codec="aac"
+              bitRate="96000"
+              sampleRate="48000"
+              channels="2" />
+    </EncoderProfile>
+
+        <ImageEncoding quality="95" />
+        <ImageEncoding quality="80" />
+        <ImageEncoding quality="70" />
+        <ImageDecoding memCap="20000000" />
+
+    </CamcorderProfiles>
+
     <EncoderOutputFileFormat name="3gp" />
     <EncoderOutputFileFormat name="mp4" />
 
diff --git a/proprietary-files-carriersettings.txt b/proprietary-files-carriersettings.txt
index c937a8a..b47a265 100644
--- a/proprietary-files-carriersettings.txt
+++ b/proprietary-files-carriersettings.txt
@@ -1,4 +1,4 @@
-# All blobs below are extracted from the release mentioned in proprietary-files.txt
+# All unpinned blobs below are extracted from the release mentioned in proprietary-files.txt
 product/etc/CarrierSettings/carrier_list.pb
 product/etc/CarrierSettings/others.pb
 product/etc/CarrierSettings/s001001imsi_3d__5e_001001_2e__2a_.pb
@@ -29,7 +29,6 @@ product/etc/CarrierSettings/s20404imsi_3d_20404360035xxxx.pb
 product/etc/CarrierSettings/s20404imsi_3d_204043914.pb
 product/etc/CarrierSettings/s20404imsi_3d_20404794.pb
 product/etc/CarrierSettings/s20404.pb
-product/etc/CarrierSettings/s20404spn_3d_c_20_spire_20_.pb
 product/etc/CarrierSettings/s20404spn_3d_c_20_spire.pb
 product/etc/CarrierSettings/s20404spn_3d__e4_b8_ad_e5_9b_bd_e7_94_b5_e4_bf_a1_.pb
 product/etc/CarrierSettings/s20404spn_3d_hot_20_mobile.pb
@@ -146,12 +145,10 @@ product/etc/CarrierSettings/s21403spn_3d_jazztel.pb
 product/etc/CarrierSettings/s21403spn_3d_masmovil.pb
 product/etc/CarrierSettings/s21403spn_3d_mobil_20_r.pb
 product/etc/CarrierSettings/s21403spn_3d_mobilr.pb
-product/etc/CarrierSettings/s21403spn_3d_orange.pb
 product/etc/CarrierSettings/s21403spn_3d_racc.pb
 product/etc/CarrierSettings/s21403spn_3d_simyo.pb
 product/etc/CarrierSettings/s21403spn_3d_virgin_20_telco.pb
 product/etc/CarrierSettings/s21404imsi_3d_2140423.pb
-product/etc/CarrierSettings/s21404imsi_3d_2140426xxxxxxxx.pb
 product/etc/CarrierSettings/s21404.pb
 product/etc/CarrierSettings/s21404spn_3d_cablemovil.pb
 product/etc/CarrierSettings/s21404spn_3d_guuk.pb
@@ -209,6 +206,7 @@ product/etc/CarrierSettings/s21422.pb
 product/etc/CarrierSettings/s21427.pb
 product/etc/CarrierSettings/s21432spn_3d_tuenti.pb
 product/etc/CarrierSettings/s21434.pb
+product/etc/CarrierSettings/s21438.pb
 product/etc/CarrierSettings/s21601.pb
 product/etc/CarrierSettings/s21630.pb
 product/etc/CarrierSettings/s21630spn_3d_t_2d_mobile_20_h.pb
@@ -282,6 +280,7 @@ product/etc/CarrierSettings/s22253.pb
 product/etc/CarrierSettings/s22254.pb
 product/etc/CarrierSettings/s22254spn_3d_plintron.pb
 product/etc/CarrierSettings/s22254spn_3d_wingsitalia.pb
+product/etc/CarrierSettings/s22256.pb
 product/etc/CarrierSettings/s22288gid1_3d_0000000099.pb
 product/etc/CarrierSettings/s22288.pb
 product/etc/CarrierSettings/s22299gid1_3d_0000000099.pb
@@ -312,6 +311,7 @@ product/etc/CarrierSettings/s22803gid1_3d_bb00.pb
 product/etc/CarrierSettings/s22803.pb
 product/etc/CarrierSettings/s22803spn_3d_ch_2d_transatel.pb
 product/etc/CarrierSettings/s22812.pb
+product/etc/CarrierSettings/s22871.pb
 product/etc/CarrierSettings/s23001.pb
 product/etc/CarrierSettings/s23001spn_3d_innogy.pb
 product/etc/CarrierSettings/s23001spn_3d_kaktus.pb
@@ -346,6 +346,10 @@ product/etc/CarrierSettings/s23203.pb
 product/etc/CarrierSettings/s23205.pb
 product/etc/CarrierSettings/s23207gid1_3d_07.pb
 product/etc/CarrierSettings/s23207gid1_3d_30.pb
+product/etc/CarrierSettings/s23207gid1_3d_70.pb
+product/etc/CarrierSettings/s23207gid1_3d_72.pb
+product/etc/CarrierSettings/s23207gid1_3d_74.pb
+product/etc/CarrierSettings/s23207gid1_3d_75.pb
 product/etc/CarrierSettings/s23207gid1_3d_ff.pb
 product/etc/CarrierSettings/s23207imsi_3d_23207718xxxxxxx.pb
 product/etc/CarrierSettings/s23207imsi_3d_2320776xxxxxxxx.pb
@@ -358,6 +362,12 @@ product/etc/CarrierSettings/s23210.pb
 product/etc/CarrierSettings/s23211.pb
 product/etc/CarrierSettings/s23212.pb
 product/etc/CarrierSettings/s23214.pb
+product/etc/CarrierSettings/s23217gid1_3d_0042.pb
+product/etc/CarrierSettings/s23217gid1_3d_0044.pb
+product/etc/CarrierSettings/s23217gid1_3d_0x0042.pb
+product/etc/CarrierSettings/s23217gid1_3d_0x0044.pb
+product/etc/CarrierSettings/s23217.pb
+product/etc/CarrierSettings/s23228.pb
 product/etc/CarrierSettings/s23401.pb
 product/etc/CarrierSettings/s23403.pb
 product/etc/CarrierSettings/s23408gid1_3d_b2ff.pb
@@ -415,6 +425,7 @@ product/etc/CarrierSettings/s23438gid1_3d_2800000000000000.pb
 product/etc/CarrierSettings/s23438.pb
 product/etc/CarrierSettings/s23439.pb
 product/etc/CarrierSettings/s23439spn_3d_jump.pb
+product/etc/CarrierSettings/s23440.pb
 product/etc/CarrierSettings/s23450imsi_3d_234500008.pb
 product/etc/CarrierSettings/s23450.pb
 product/etc/CarrierSettings/s23453.pb
@@ -447,8 +458,19 @@ product/etc/CarrierSettings/s24002.pb
 product/etc/CarrierSettings/s24004.pb
 product/etc/CarrierSettings/s24005spn_3d_telia.pb
 product/etc/CarrierSettings/s24006.pb
-product/etc/CarrierSettings/s24006spn_3d_vimla.pb
+product/etc/CarrierSettings/s24007gid1_3d_0040.pb
+product/etc/CarrierSettings/s24007gid1_3d_0041.pb
+product/etc/CarrierSettings/s24007gid1_3d_0042.pb
+product/etc/CarrierSettings/s24007gid1_3d_0044.pb
+product/etc/CarrierSettings/s24007gid1_3d_0048.pb
 product/etc/CarrierSettings/s24007gid1_3d_0c.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0040.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0041.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0042.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0044.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0048.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0050.pb
+product/etc/CarrierSettings/s24007gid1_3d_0x0052.pb
 product/etc/CarrierSettings/s24007imsi_3d_240075610.pb
 product/etc/CarrierSettings/s24007imsi_3d_240075614.pb
 product/etc/CarrierSettings/s24007imsi_3d_24007561.pb
@@ -473,6 +495,7 @@ product/etc/CarrierSettings/s24209.pb
 product/etc/CarrierSettings/s24212.pb
 product/etc/CarrierSettings/s24214.pb
 product/etc/CarrierSettings/s24215gid1_3d_0e.pb
+product/etc/CarrierSettings/s24215.pb
 product/etc/CarrierSettings/s24403.pb
 product/etc/CarrierSettings/s24404.pb
 product/etc/CarrierSettings/s24405.pb
@@ -486,6 +509,9 @@ product/etc/CarrierSettings/s24601.pb
 product/etc/CarrierSettings/s24602.pb
 product/etc/CarrierSettings/s24603.pb
 product/etc/CarrierSettings/s246081.pb
+product/etc/CarrierSettings/s246082.pb
+product/etc/CarrierSettings/s246083.pb
+product/etc/CarrierSettings/s246084.pb
 product/etc/CarrierSettings/s24681.pb
 product/etc/CarrierSettings/s24701.pb
 product/etc/CarrierSettings/s24702.pb
@@ -529,6 +555,7 @@ product/etc/CarrierSettings/s25507.pb
 product/etc/CarrierSettings/s25701.pb
 product/etc/CarrierSettings/s25702.pb
 product/etc/CarrierSettings/s25901.pb
+product/etc/CarrierSettings/s25902.pb
 product/etc/CarrierSettings/s25905.pb
 product/etc/CarrierSettings/s26001.pb
 product/etc/CarrierSettings/s26002gid1_3d_11.pb
@@ -635,6 +662,8 @@ product/etc/CarrierSettings/s26202imsi_3d_262028.pb
 product/etc/CarrierSettings/s26202imsi_3d_262029.pb
 product/etc/CarrierSettings/s26202.pb
 product/etc/CarrierSettings/s26202spn_3d_1_26_1.pb
+product/etc/CarrierSettings/s26203imsi_3d_26203293x.pb
+product/etc/CarrierSettings/s26203imsi_3d_26203330x.pb
 product/etc/CarrierSettings/s26203.pb
 product/etc/CarrierSettings/s26204.pb
 product/etc/CarrierSettings/s26205.pb
@@ -653,9 +682,10 @@ product/etc/CarrierSettings/s26206spn_3d_t_2d_mobile_20_d.pb
 product/etc/CarrierSettings/s26206spn_3d_telekom_2e_de.pb
 product/etc/CarrierSettings/s26207gid1_3d_010301ffffffffffffffffffffffffffffffffff.pb
 product/etc/CarrierSettings/s26207gid1_3d_010901ffffffffffffffffffffffffffffffffff.pb
-product/etc/CarrierSettings/s26207imsi_3d_2620739xxxxxxxx.pb
+product/etc/CarrierSettings/s26207gid1_3d_118004.pb
+product/etc/CarrierSettings/s26207gid1_3d_118006.pb
+product/etc/CarrierSettings/s26207imsi_3d_26207414x.pb
 product/etc/CarrierSettings/s26207imsi_3d_2620749.pb
-product/etc/CarrierSettings/s26207imsi_3d_2620749xxxxxxxx.pb
 product/etc/CarrierSettings/s26207imsi_3d_26207500.pb
 product/etc/CarrierSettings/s26207imsi_3d_26207515.pb
 product/etc/CarrierSettings/s26207imsi_3d_26207520.pb
@@ -666,6 +696,8 @@ product/etc/CarrierSettings/s26209.pb
 product/etc/CarrierSettings/s26210.pb
 product/etc/CarrierSettings/s26211.pb
 product/etc/CarrierSettings/s26212.pb
+product/etc/CarrierSettings/s26214.pb
+product/etc/CarrierSettings/s26221.pb
 product/etc/CarrierSettings/s26223.pb
 product/etc/CarrierSettings/s26242.pb
 product/etc/CarrierSettings/s26277.pb
@@ -744,6 +776,8 @@ product/etc/CarrierSettings/s29702spn_3d_telekom_2e_me.pb
 product/etc/CarrierSettings/s29703.pb
 product/etc/CarrierSettings/s302130.pb
 product/etc/CarrierSettings/s302131.pb
+product/etc/CarrierSettings/s302150.pb
+product/etc/CarrierSettings/s302151.pb
 product/etc/CarrierSettings/s302220gid1_3d_4b4f.pb
 product/etc/CarrierSettings/s302220gid1_3d_4d4f.pb
 product/etc/CarrierSettings/s302220gid1_3d_5043.pb
@@ -763,7 +797,6 @@ product/etc/CarrierSettings/s302220gid1_3d_6836.pb
 product/etc/CarrierSettings/s302220gid1_3d_6838.pb
 product/etc/CarrierSettings/s302220gid1_3d_7330.pb
 product/etc/CarrierSettings/s302220gid1_3d_7530.pb
-product/etc/CarrierSettings/s302220spn_3d_wom_20_roaming_20_int.pb
 product/etc/CarrierSettings/s302221gid1_3d_4b4f.pb
 product/etc/CarrierSettings/s302221gid1_3d_4d4f.pb
 product/etc/CarrierSettings/s302221gid1_3d_5043.pb
@@ -816,6 +849,7 @@ product/etc/CarrierSettings/s30268.pb
 product/etc/CarrierSettings/s302690gid1_3d_41.pb
 product/etc/CarrierSettings/s302690gid1_3d_43.pb
 product/etc/CarrierSettings/s302690.pb
+product/etc/CarrierSettings/s30271.pb
 product/etc/CarrierSettings/s302720gid1_3d_a4.pb
 product/etc/CarrierSettings/s302720gid1_3d_ba.pb
 product/etc/CarrierSettings/s302720gid1_3d_d2.pb
@@ -827,6 +861,7 @@ product/etc/CarrierSettings/s302720imsi_3d_302720x98.pb
 product/etc/CarrierSettings/s302720imsi_3d_302720x98xx.pb
 product/etc/CarrierSettings/s302720.pb
 product/etc/CarrierSettings/s302720spn_3d_cityfone.pb
+product/etc/CarrierSettings/s302721.pb
 product/etc/CarrierSettings/s30272.pb
 product/etc/CarrierSettings/s302780.pb
 product/etc/CarrierSettings/s302860.pb
@@ -1003,6 +1038,7 @@ product/etc/CarrierSettings/s310050spn_3d_alaskacomm.pb
 product/etc/CarrierSettings/s310066.pb
 product/etc/CarrierSettings/s310070.pb
 product/etc/CarrierSettings/s310080.pb
+product/etc/CarrierSettings/s310090gid1_3d_80ff.pb
 product/etc/CarrierSettings/s310090.pb
 product/etc/CarrierSettings/s310100.pb
 product/etc/CarrierSettings/s310110.pb
@@ -1206,8 +1242,13 @@ product/etc/CarrierSettings/s310240gid1_3d_6438.pb
 product/etc/CarrierSettings/s310240gid1_3d_6440.pb
 product/etc/CarrierSettings/s310240gid1_3d_6901.pb
 product/etc/CarrierSettings/s310240gid1_3d_6902.pb
+product/etc/CarrierSettings/s310240gid1_3d_6903.pb
 product/etc/CarrierSettings/s310240gid1_3d_6905.pb
+product/etc/CarrierSettings/s310240gid1_3d_6907.pb
 product/etc/CarrierSettings/s310240gid1_3d_6909.pb
+product/etc/CarrierSettings/s310240gid1_3d_6910.pb
+product/etc/CarrierSettings/s310240gid1_3d_6911.pb
+product/etc/CarrierSettings/s310240gid1_3d_6912.pb
 product/etc/CarrierSettings/s310240gid1_3d_6941.pb
 product/etc/CarrierSettings/s310240gid1_3d_6957.pb
 product/etc/CarrierSettings/s310240gid1_3d_6c79.pb
@@ -1216,6 +1257,7 @@ product/etc/CarrierSettings/s310240gid1_3d_7031.pb
 product/etc/CarrierSettings/s310240gid1_3d_7032.pb
 product/etc/CarrierSettings/s310240gid1_3d_7531.pb
 product/etc/CarrierSettings/s310240gid1_3d_756d.pb
+product/etc/CarrierSettings/s310240gid1_3d_7601.pb
 product/etc/CarrierSettings/s310240gid1_3d_ddff.pb
 product/etc/CarrierSettings/s310240gid1_3d_deff.pb
 product/etc/CarrierSettings/s310240.pb
@@ -1265,6 +1307,13 @@ product/etc/CarrierSettings/s310260gid1_3d_62ff.pb
 product/etc/CarrierSettings/s310260gid1_3d_6303.pb
 product/etc/CarrierSettings/s310260gid1_3d_6901.pb
 product/etc/CarrierSettings/s310260gid1_3d_6902.pb
+product/etc/CarrierSettings/s310260gid1_3d_6903.pb
+product/etc/CarrierSettings/s310260gid1_3d_6905.pb
+product/etc/CarrierSettings/s310260gid1_3d_6907.pb
+product/etc/CarrierSettings/s310260gid1_3d_6909.pb
+product/etc/CarrierSettings/s310260gid1_3d_6910.pb
+product/etc/CarrierSettings/s310260gid1_3d_6911.pb
+product/etc/CarrierSettings/s310260gid1_3d_6912.pb
 product/etc/CarrierSettings/s310260gid1_3d_6941.pb
 product/etc/CarrierSettings/s310260gid1_3d_6957.pb
 product/etc/CarrierSettings/s310260gid1_3d_69ff.pb
@@ -1277,6 +1326,7 @@ product/etc/CarrierSettings/s310260gid1_3d_7376.pb
 product/etc/CarrierSettings/s310260gid1_3d_7477.pb
 product/etc/CarrierSettings/s310260gid1_3d_7531.pb
 product/etc/CarrierSettings/s310260gid1_3d_756d.pb
+product/etc/CarrierSettings/s310260gid1_3d_7601.pb
 product/etc/CarrierSettings/s310260gid1_3d_8234.pb
 product/etc/CarrierSettings/s310260gid1_3d_ab.pb
 product/etc/CarrierSettings/s310260gid1_3d_ddff.pb
@@ -1348,15 +1398,12 @@ product/etc/CarrierSettings/s310410gid1_3d_30ff.pb
 product/etc/CarrierSettings/s310410gid1_3d_3430.pb
 product/etc/CarrierSettings/s310410gid1_3d_3432.pb
 product/etc/CarrierSettings/s310410gid1_3d_3434.pb
-product/etc/CarrierSettings/s310410gid1_3d_3436_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb
 product/etc/CarrierSettings/s310410gid1_3d_3436.pb
 product/etc/CarrierSettings/s310410gid1_3d_3438.pb
 product/etc/CarrierSettings/s310410gid1_3d_3440.pb
-product/etc/CarrierSettings/s310410gid1_3d_3442_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb
 product/etc/CarrierSettings/s310410gid1_3d_3442.pb
 product/etc/CarrierSettings/s310410gid1_3d_3444.pb
 product/etc/CarrierSettings/s310410gid1_3d_3446.pb
-product/etc/CarrierSettings/s310410gid1_3d_3448_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb
 product/etc/CarrierSettings/s310410gid1_3d_3448.pb
 product/etc/CarrierSettings/s310410gid1_3d_3450.pb
 product/etc/CarrierSettings/s310410gid1_3d_3452.pb
@@ -1395,8 +1442,10 @@ product/etc/CarrierSettings/s310580.pb
 product/etc/CarrierSettings/s310580spn_3d_sprint.pb
 product/etc/CarrierSettings/s310590gid1_3d_ba01270000000000.pb
 product/etc/CarrierSettings/s310590gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s310590gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s310590.pb
 product/etc/CarrierSettings/s310591gid1_3d_ba01270000000000.pb
+product/etc/CarrierSettings/s310591gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s310591.pb
 product/etc/CarrierSettings/s310592gid1_3d_ba01270000000000.pb
 product/etc/CarrierSettings/s310592.pb
@@ -1414,6 +1463,7 @@ product/etc/CarrierSettings/s310598gid1_3d_ba01270000000000.pb
 product/etc/CarrierSettings/s310598.pb
 product/etc/CarrierSettings/s310599gid1_3d_ba01270000000000.pb
 product/etc/CarrierSettings/s310599gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s310599gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s310599.pb
 product/etc/CarrierSettings/s310600gid1_3d_ba00040000000000.pb
 product/etc/CarrierSettings/s310600.pb
@@ -1576,13 +1626,13 @@ product/etc/CarrierSettings/s311410.pb
 product/etc/CarrierSettings/s311410spn_3d_chatmobrsa2.pb
 product/etc/CarrierSettings/s311420gid1_3d_ba00150000000000.pb
 product/etc/CarrierSettings/s311420.pb
+product/etc/CarrierSettings/s311430gid1_3d_ba00130000000000.pb
 product/etc/CarrierSettings/s311430.pb
 product/etc/CarrierSettings/s311430spn_3d_chatmobrsa1.pb
 product/etc/CarrierSettings/s311440gid1_3d_ba00010000000000.pb
 product/etc/CarrierSettings/s311440.pb
 product/etc/CarrierSettings/s311450.pb
 product/etc/CarrierSettings/s311450spn_3d_sprint.pb
-product/etc/CarrierSettings/s311480gid1_3d_b100000000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_ba00010000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_ba00020000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_ba00030000000000.pb
@@ -1606,6 +1656,8 @@ product/etc/CarrierSettings/s311480gid1_3d_ba01450000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_ba01490000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_ba01500000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_ba01570000000000.pb
+product/etc/CarrierSettings/s311480gid1_3d_ba01620000000000.pb
+product/etc/CarrierSettings/s311480gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_bae1000000000000.pb
 product/etc/CarrierSettings/s311480gid1_3d_bae2000000000000.pb
 product/etc/CarrierSettings/s311480.pb
@@ -1615,22 +1667,31 @@ product/etc/CarrierSettings/s311480spn_3d_snakeriver.pb
 product/etc/CarrierSettings/s311480spn_3d_southcentral.pb
 product/etc/CarrierSettings/s311480spn_3d_syringa.pb
 product/etc/CarrierSettings/s311481gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311481gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311481.pb
 product/etc/CarrierSettings/s311482gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311482gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311482.pb
 product/etc/CarrierSettings/s311483gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311483gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311483.pb
 product/etc/CarrierSettings/s311484gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311484gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311484.pb
 product/etc/CarrierSettings/s311485gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311485gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311485.pb
 product/etc/CarrierSettings/s311486gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311486gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311486.pb
 product/etc/CarrierSettings/s311487gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311487gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311487.pb
 product/etc/CarrierSettings/s311488gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311488gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311488.pb
 product/etc/CarrierSettings/s311489gid1_3d_ba01450000000000.pb
+product/etc/CarrierSettings/s311489gid1_3d_ba01640000000000.pb
 product/etc/CarrierSettings/s311489.pb
 product/etc/CarrierSettings/s311490gid1_3d_000003.pb
 product/etc/CarrierSettings/s311490gid1_3d_000005.pb
@@ -1666,6 +1727,7 @@ product/etc/CarrierSettings/s311588.pb
 product/etc/CarrierSettings/s311589.pb
 product/etc/CarrierSettings/s311590.pb
 product/etc/CarrierSettings/s311590spn_3d_gsc.pb
+product/etc/CarrierSettings/s311600.pb
 product/etc/CarrierSettings/s311600spn_3d_cox.pb
 product/etc/CarrierSettings/s311610gid1_3d_ba00100000000000.pb
 product/etc/CarrierSettings/s311610.pb
@@ -1914,6 +1976,8 @@ product/etc/CarrierSettings/s313930.pb
 product/etc/CarrierSettings/s314020.pb
 product/etc/CarrierSettings/s314090.pb
 product/etc/CarrierSettings/s314200.pb
+product/etc/CarrierSettings/s314240.pb
+product/etc/CarrierSettings/s315010.pb
 product/etc/CarrierSettings/s316010.pb
 product/etc/CarrierSettings/s330000.pb
 product/etc/CarrierSettings/s330110gid1_3d_deff.pb
@@ -1933,11 +1997,15 @@ product/etc/CarrierSettings/s33403.pb
 product/etc/CarrierSettings/s334040.pb
 product/etc/CarrierSettings/s334050gid1_3d_424c5545ffffffffff.pb
 product/etc/CarrierSettings/s334050gid1_3d_4d454741ffffffffff.pb
+product/etc/CarrierSettings/s334050gid1_3d_4e45575757ffffffff.pb
 product/etc/CarrierSettings/s334050gid1_3d_55424958ffffffffff.pb
+product/etc/CarrierSettings/s334050gid1_3d_594fffffffffffffff.pb
 product/etc/CarrierSettings/s334050.pb
 product/etc/CarrierSettings/s33405gid1_3d_424c5545ffffffffff.pb
 product/etc/CarrierSettings/s33405gid1_3d_4d454741ffffffffff.pb
+product/etc/CarrierSettings/s33405gid1_3d_4e45575757ffffffff.pb
 product/etc/CarrierSettings/s33405gid1_3d_55424958ffffffffff.pb
+product/etc/CarrierSettings/s33405gid1_3d_594fffffffffffffff.pb
 product/etc/CarrierSettings/s33405.pb
 product/etc/CarrierSettings/s334070.pb
 product/etc/CarrierSettings/s334080.pb
@@ -1973,6 +2041,7 @@ product/etc/CarrierSettings/s334140spn_3d_ubix.pb
 product/etc/CarrierSettings/s334140spn_3d_valor.pb
 product/etc/CarrierSettings/s334140spn_3d_wimo.pb
 product/etc/CarrierSettings/s334140spn_3d_yo.pb
+product/etc/CarrierSettings/s334160.pb
 product/etc/CarrierSettings/s33430.pb
 product/etc/CarrierSettings/s338050.pb
 product/etc/CarrierSettings/s338070.pb
@@ -2375,9 +2444,12 @@ product/etc/CarrierSettings/s42101.pb
 product/etc/CarrierSettings/s42102.pb
 product/etc/CarrierSettings/s42103.pb
 product/etc/CarrierSettings/s42104.pb
+product/etc/CarrierSettings/s42111.pb
+product/etc/CarrierSettings/s42122.pb
 product/etc/CarrierSettings/s42202.pb
 product/etc/CarrierSettings/s42203.pb
 product/etc/CarrierSettings/s42204.pb
+product/etc/CarrierSettings/s42206.pb
 product/etc/CarrierSettings/s42402.pb
 product/etc/CarrierSettings/s42403imsi_3d_424030221xxxxxx.pb
 product/etc/CarrierSettings/s42403imsi_3d_424030222xxxxxx.pb
@@ -2446,6 +2518,8 @@ product/etc/CarrierSettings/s44010.pb
 product/etc/CarrierSettings/s44010spn_3d_rakuten.pb
 product/etc/CarrierSettings/s44011.pb
 product/etc/CarrierSettings/s44013.pb
+product/etc/CarrierSettings/s44020gid1_3d_01ffff.pb
+product/etc/CarrierSettings/s44020gid1_3d_16ffff.pb
 product/etc/CarrierSettings/s44020.pb
 product/etc/CarrierSettings/s44050gid1_3d_10.pb
 product/etc/CarrierSettings/s44050gid1_3d_20.pb
@@ -2498,6 +2572,8 @@ product/etc/CarrierSettings/s45404.pb
 product/etc/CarrierSettings/s45404spn_3d__e4_b8_ad_e5_9b_bd_e7_94_b5_e4_bf_a1_.pb
 product/etc/CarrierSettings/s45405.pb
 product/etc/CarrierSettings/s45406.pb
+product/etc/CarrierSettings/s45407imsi_3d_454078.pb
+product/etc/CarrierSettings/s45407imsi_3d_454079.pb
 product/etc/CarrierSettings/s45407.pb
 product/etc/CarrierSettings/s45409.pb
 product/etc/CarrierSettings/s45410.pb
@@ -2538,6 +2614,19 @@ product/etc/CarrierSettings/s45701.pb
 product/etc/CarrierSettings/s45702.pb
 product/etc/CarrierSettings/s45703.pb
 product/etc/CarrierSettings/s45708.pb
+product/etc/CarrierSettings/s46000.pb
+product/etc/CarrierSettings/s46001.pb
+product/etc/CarrierSettings/s46002.pb
+product/etc/CarrierSettings/s46003.pb
+product/etc/CarrierSettings/s46004.pb
+product/etc/CarrierSettings/s46006.pb
+product/etc/CarrierSettings/s46007.pb
+product/etc/CarrierSettings/s46008.pb
+product/etc/CarrierSettings/s46009.pb
+product/etc/CarrierSettings/s46011.pb
+product/etc/CarrierSettings/s46012.pb
+product/etc/CarrierSettings/s46013.pb
+product/etc/CarrierSettings/s46015.pb
 product/etc/CarrierSettings/s46030.pb
 product/etc/CarrierSettings/s46601imsi_3d_4660116090.pb
 product/etc/CarrierSettings/s46601imsi_3d_4660116091.pb
@@ -2595,6 +2684,7 @@ product/etc/CarrierSettings/s50571.pb
 product/etc/CarrierSettings/s50572.pb
 product/etc/CarrierSettings/s50588.pb
 product/etc/CarrierSettings/s50590.pb
+product/etc/CarrierSettings/s50599.pb
 product/etc/CarrierSettings/s51001.pb
 product/etc/CarrierSettings/s51008.pb
 product/etc/CarrierSettings/s51009.pb
@@ -2638,10 +2728,10 @@ product/etc/CarrierSettings/s52802.pb
 product/etc/CarrierSettings/s52811.pb
 product/etc/CarrierSettings/s53001.pb
 product/etc/CarrierSettings/s53001spn_3d_vodafone_20_nz.pb
-product/etc/CarrierSettings/s53005imsi_3d_53005204.pb
 product/etc/CarrierSettings/s53005.pb
 product/etc/CarrierSettings/s53024.pb
 product/etc/CarrierSettings/s53024spn_3d_warehouse.pb
+product/etc/CarrierSettings/s53099.pb
 product/etc/CarrierSettings/s53602.pb
 product/etc/CarrierSettings/s53701.pb
 product/etc/CarrierSettings/s53703.pb
@@ -2845,6 +2935,7 @@ product/etc/CarrierSettings/s65502.pb
 product/etc/CarrierSettings/s65507.pb
 product/etc/CarrierSettings/s65507spn_3d_virgin.pb
 product/etc/CarrierSettings/s65510.pb
+product/etc/CarrierSettings/s65512.pb
 product/etc/CarrierSettings/s65701.pb
 product/etc/CarrierSettings/s70267.pb
 product/etc/CarrierSettings/s70299.pb
@@ -2866,6 +2957,7 @@ product/etc/CarrierSettings/s708040.pb
 product/etc/CarrierSettings/s70804.pb
 product/etc/CarrierSettings/s71021.pb
 product/etc/CarrierSettings/s710300.pb
+product/etc/CarrierSettings/s71030.pb
 product/etc/CarrierSettings/s710730.pb
 product/etc/CarrierSettings/s71073.pb
 product/etc/CarrierSettings/s71201.pb
@@ -2979,17 +3071,16 @@ product/etc/CarrierSettings/s90137.pb
 product/etc/CarrierSettings/s90143.pb
 product/etc/CarrierSettings/s90158.pb
 
-# from rtwo_retcn T1TR33.4-30-77
-product/etc/CarrierSettings/s46000.pb|7009382c35d7a43535cd817337e86b1ef38241d6
-product/etc/CarrierSettings/s46001.pb|8dd3dfc8fa7024653dbcbaeadc5df2aef2dfd711
-product/etc/CarrierSettings/s46002.pb|9202512823668f6a4e17b97dc5bda97367714148
-product/etc/CarrierSettings/s46003.pb|3d1ff452db76aeaf021a3a12d4a5f669a91d2168
-product/etc/CarrierSettings/s46004.pb|6e1a823572f1c0542e71fa0ce5941a949d80e35b
-product/etc/CarrierSettings/s46006.pb|8e2b352a020a69a3cb415adea204574fec6b195e
-product/etc/CarrierSettings/s46007.pb|f9c1329b7b9e45357fa91a3e17b8e3e7ff5de73e
-product/etc/CarrierSettings/s46008.pb|ca64c2a76e349f064456522763c343f5398affdc
-product/etc/CarrierSettings/s46009.pb|0cc72e51a1f4a9117eb67beb39264898aac91d14
-product/etc/CarrierSettings/s46011.pb|cd9e7497f60eff88503f24df056913ada07ab469
-product/etc/CarrierSettings/s46012.pb|da4421224361a2b08f10ccaef95f623ab1f42b96
-product/etc/CarrierSettings/s46013.pb|6a442105a3662ceef6cb917e931663178d2d8b33
-product/etc/CarrierSettings/s46015.pb|ebcbe85d0365fa4f55e7d67ba668e1f65b53a8cb
+# CarrierSettings - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys
+product/etc/CarrierSettings/s20404spn_3d_c_20_spire_20_.pb|7b074d1dc0800baef0f5f24acc8bc467db59cb99
+product/etc/CarrierSettings/s21403spn_3d_orange.pb|127c822d108765530395fdb0d17f64171d9302e8
+product/etc/CarrierSettings/s21404imsi_3d_2140426xxxxxxxx.pb|fc605689d3ac6a7336ba849674c19bb1b84a0815
+product/etc/CarrierSettings/s24006spn_3d_vimla.pb|582c3069166a80d825e87b1b2e7cb25cac6b80ce
+product/etc/CarrierSettings/s26207imsi_3d_2620739xxxxxxxx.pb|5638e57f90a034519caaae7b666ea442014f20de
+product/etc/CarrierSettings/s26207imsi_3d_2620749xxxxxxxx.pb|f9e0a3dda8c7efffd332595e701873e4948b594e
+product/etc/CarrierSettings/s302220spn_3d_wom_20_roaming_20_int.pb|7c8aca3e311d3abf43023b5b1a29556282e47181
+product/etc/CarrierSettings/s310410gid1_3d_3436_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb|1dd84de5a216be1f986531f02735ecec2498bf65
+product/etc/CarrierSettings/s310410gid1_3d_3442_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb|40814e6149193ac64d89813cac8105ec62c7d31f
+product/etc/CarrierSettings/s310410gid1_3d_3448_20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20__20_.pb|d91cd40c1772c4a9f6dbfdc306912f4f4a1b71a6
+product/etc/CarrierSettings/s311480gid1_3d_b100000000000000.pb|c4610adf0b06dc6306afa9a07922c9a747decd9a
+product/etc/CarrierSettings/s53005imsi_3d_53005204.pb|4babfed96141650aa1fad582bc2c514204bca719
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c80ee48..fe0d108 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from rtwo_g-user 13 T1TR33.43-48-41 49227-28ba2 release-keys.
+# All unpinned blobs below are extracted from rtwo_retcn-user 14 U1TR43.8-19-2 9bfa3-adc28 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
@@ -33,11 +33,11 @@ vendor/lib/libar-acdb.so
 vendor/lib64/libar-acdb.so
 
 # Audio - aualgo config
-vendor/etc/aualgo/ainr_1.tflite
-vendor/etc/aualgo/ainr_2.tflite
-vendor/etc/aualgo/aualgo_azp.conf
+vendor/etc/aualgo/ainr_tfv2.dat
+vendor/etc/aualgo/aualgo_ainr.conf
+vendor/etc/aualgo/aualgo_arp.conf
+vendor/etc/aualgo/aualgo_comp_azpp.conf
 vendor/etc/aualgo/aualgo_sst.conf
-vendor/etc/aualgo_arp_conf.inix
 
 # Camera
 vendor/etc/eva/facedetection/model3.dat
@@ -90,7 +90,7 @@ vendor/lib/libmctfengine_stub.so
 vendor/lib/libmfGhostDetection.so
 vendor/lib/libmfec.so
 vendor/lib/libmmcamera_bestats.so
-vendor/lib/libmmcamera_cac3.so
+vendor/lib/libmmcamera_cac.so
 vendor/lib/libmmcamera_lscv35.so
 vendor/lib/libmmcamera_mfnr.so
 vendor/lib/libmmcamera_mfnr_t4.so
@@ -198,7 +198,7 @@ vendor/lib64/libmctfengine_stub.so
 vendor/lib64/libmfGhostDetection.so
 vendor/lib64/libmfec.so
 vendor/lib64/libmmcamera_bestats.so
-vendor/lib64/libmmcamera_cac3.so
+vendor/lib64/libmmcamera_cac.so
 vendor/lib64/libmmcamera_lscv35.so
 vendor/lib64/libmmcamera_mfnr.so
 vendor/lib64/libmmcamera_mfnr_t4.so
@@ -582,10 +582,10 @@ vendor/lib64/libesesbprovision.so
 vendor/lib64/vendor.qti.esepowermanager@1.0.so
 vendor/lib64/vendor.qti.esepowermanager@1.1.so
 
-# eUICC
-product/app/EuiccPartnerApp/EuiccPartnerApp.apk
-product/etc/permissions/privapp-permissions-com.google.android.euicc.xml
-product/priv-app/EuiccGoogle/EuiccGoogle.apk
+# eUICC - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys
+product/app/EuiccPartnerApp/EuiccPartnerApp.apk|134967f91e11db5da58faff4a0bb862bda2bb1a1
+product/etc/permissions/privapp-permissions-com.google.android.euicc.xml|ef99fe93aa2ed629fef39c3dcc4b07c597c1f469
+product/priv-app/EuiccGoogle/EuiccGoogle.apk|e1f63b736410953ccf7591cfc3813e0360a9dfa4
 
 # Fingerprint
 vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice
@@ -595,37 +595,37 @@ vendor/lib64/hw/fingerprint.goodix.so
 vendor/lib64/libgf_hal.so
 vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@2.1_vendor.so
 
-# HotwordEnrollment
-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk
-product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk
-system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
-system_ext/framework/com.android.hotwordenrollment.common.util.jar
+# HotwordEnrollment - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys
+product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk|6a060ccfd9f867f3e09fae09dff6f2d9201fe452
+product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk|ae98926e4620b4108a22127d355be9f44c1e782e
+system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml|99cfd80965c170f4885a7dd62c0eaad1a0c7840f
+system_ext/framework/com.android.hotwordenrollment.common.util.jar|a418f5697951468fb93788b6e92d2912e7ae7149
 
-# MotCamera4
-product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED
-product/etc/permissions/com.motorola.camera3.xml
-product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
-product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
-product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
-product/priv-app/MotCamera4/MotCamera4.apk;PRESIGNED
-system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED
-system/etc/permissions/com.motorola.motosignature.xml
-system/etc/permissions/moto-core_services.xml
-system/etc/permissions/moto-settings.xml
-system/framework/com.motorola.motosignature.jar
-system/framework/moto-core_services.jar
-system/framework/moto-settings.jar
-system_ext/bin/motsettings
-system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
+# MotCamera4 - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys
+product/app/MotCamera3AI/MotCamera3AI.apk;PRESIGNED|6f2c48d2cdf1de43471401dc54934faeb05265d2
+product/etc/permissions/com.motorola.camera3.xml|0d383cbc8f265d80e4f08c9bb9ecefe321a29a7d
+product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml|7df06ec01397dfba8860c84f71805b0895d14087
+product/etc/permissions/privapp-permissions-com.motorola.camera3.xml|b759bdaf7baca0dcc8ee5e1d1faf51c78d43c4a1
+product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml|d99de1fb201aa63d9d543a41104013989fc84dc9
+product/priv-app/MotCamera4/MotCamera4.apk;PRESIGNED|701a23eae2b51d9b73bd47127ffbf5eb3eefc406
+system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED|315d0e5dc4565a046e4119fe203ab951f5e1cd72
+system/etc/permissions/com.motorola.motosignature.xml|657458b1f279e2158db87925dcd518d48f9afcf7
+system/etc/permissions/moto-core_services.xml|e04036b61adefe98f1e59e47e479d41e695ba94e
+system/etc/permissions/moto-settings.xml|32f6aeb6f8e9211542bf843ba106acc7ab7c2839
+system/framework/com.motorola.motosignature.jar|3b05b367afffd9b96031aba2b26dc3d24397c73a
+system/framework/moto-core_services.jar|1936fbbe645789c41a2fea3edc795e472063b405
+system/framework/moto-settings.jar|02fb105b6476b1e405a9527b8993347f00419213
+system_ext/bin/motsettings|629acaf083fb5fb9ea171c8e87115918043cae90
+system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk|24f463c7f933140eabac397cd305c47bdc6cf496
 
-# Moto Permissions
-product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml
-product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml
-product/etc/permissions/com.motorola.camera3.rtwo.xml:vendor/etc/permissions/com.motorola.camera3.rtwo.xml
-product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml
-product/etc/permissions/com.motorola.moto-uirefresh.xml
-product/etc/permissions/com.motorola.motodisplay.xml
-product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml
+# Moto Permissions - from motorola/rtwo_g/msi:13/T1TRS33.43-48-41-3/ac9a4-9767e:user/release-keys
+product/etc/permissions/com.motorola.camera3.content.ai.xml:vendor/etc/permissions/com.motorola.camera3.content.ai.xml|261f857c62c97286f492b3f5c69ff11226a06af0
+product/etc/permissions/com.motorola.camera3.lens.xml:vendor/etc/permissions/com.motorola.camera3.lens.xml|7dfafac8d89447a1e0bc93fd5cea5ca6e5c20bee
+product/etc/permissions/com.motorola.camera3.rtwo.xml:vendor/etc/permissions/com.motorola.camera3.rtwo.xml|f3294bb3f8a743c2885e1e93251a42a5369c4d45
+product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.motorola.camera3.xml|0d383cbc8f265d80e4f08c9bb9ecefe321a29a7d
+product/etc/permissions/com.motorola.moto-uirefresh.xml|a5c91ea6d99ad0d14e6e13000516c89098621837
+product/etc/permissions/com.motorola.motodisplay.xml|8d2c13a91e2f89f61a82ec2dcfc1958b618a42a5
+product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml|54a9493312161097ee7b424e0e5ebb0c20fd595e
 
 # NFC
 vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service
diff --git a/vendor.prop b/vendor.prop
index 2350356..67f9ed9 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -3,6 +3,7 @@ bluetooth.device.default_name=motorola edge 40 pro
 
 # Camera
 persist.vendor.camera.physical.num=4
+ro.camera.enableCamera1MaxZsl=1
 
 # Fingerprint
 ro.hardware.fingerprint=goodix