X6837: Sync with dt changes

Change-Id: I0516d361bd3d421f01aab667c2613384fcf47621
Signed-off-by: vlxlxlv <fajarslebew31@gmail.com>

Android.bp

@@ -385,43 +385,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libccci_util",
-    owner: "infinix",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libccci_util.so",
-            ],
-            shared_libs: [
-                "libc",
-                "liblog",
-                "libc++",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libccci_util.so",
-            ],
-            shared_libs: [
-                "libc",
-                "liblog",
-                "libc++",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libgz_gp_client",
     owner: "infinix",
@@ -777,117 +740,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libmtkcutils",
-    owner: "infinix",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libmtkcutils.so",
-            ],
-            shared_libs: [
-                "libmtkrillog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libmtkcutils.so",
-            ],
-            shared_libs: [
-                "libmtkrillog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libmtkproperty",
-    owner: "infinix",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libmtkproperty.so",
-            ],
-            shared_libs: [
-                "libmtkrillog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libmtkproperty.so",
-            ],
-            shared_libs: [
-                "libmtkrillog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libmtkrillog",
-    owner: "infinix",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libmtkrillog.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libmtkrillog.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libvcodec_oal",
     owner: "infinix",
@@ -9884,6 +9736,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libccci_util",
+    owner: "infinix",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libccci_util.so",
+            ],
+            shared_libs: [
+                "libc",
+                "liblog",
+                "libc++",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libcmdl",
     owner: "infinix",
@@ -11545,6 +11422,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmtkcutils",
+    owner: "infinix",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libmtkcutils.so",
+            ],
+            shared_libs: [
+                "libmtkrillog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libmtkhardware_legacy",
     owner: "infinix",
@@ -11721,6 +11623,56 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmtkproperty",
+    owner: "infinix",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libmtkproperty.so",
+            ],
+            shared_libs: [
+                "libmtkrillog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libmtkrillog",
+    owner: "infinix",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libmtkrillog.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libmtkrilutils",
     owner: "infinix",
@@ -25900,11 +25852,12 @@ cc_prebuilt_binary {
     name: "gsm0710muxd",
     owner: "infinix",
     target: {
-        android_arm: {
+        android_arm64: {
             srcs: [
                 "proprietary/vendor/bin/gsm0710muxd",
             ],
             shared_libs: [
+                "libcutils",
                 "libmtkcutils",
                 "libmtkrillog",
                 "libmtkproperty",
@@ -25916,7 +25869,7 @@ cc_prebuilt_binary {
             ],
         },
     },
-    compile_multilib: "32",
+    compile_multilib: "64",
     strip: {
         none: true,
     },

Android.mk

@@ -6,17 +6,17 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),X6837)
 
-$(call add-radio-file-sha1-checked,radio/dpm.img,3d96e838ae076450ee6dc26d4bf3d8b88dc22bb4)
+$(call add-radio-file-sha1-checked,radio/dpm.img,605ae12b75bddf57b34e600a5d3d89ffb563139d)
-$(call add-radio-file-sha1-checked,radio/gz.img,50bcb4cf4466ce9a501d13c8bdede2620b995b0f)
+$(call add-radio-file-sha1-checked,radio/gz.img,54f67ab90d5e37bbf4319586c6724b44e362c985)
-$(call add-radio-file-sha1-checked,radio/lk.img,d93f0a00e8ae064195141c154cdbb89f6f7bbd63)
+$(call add-radio-file-sha1-checked,radio/lk.img,78dd701e5c3dbd06357d01b2596ce83a28f4d27c)
-$(call add-radio-file-sha1-checked,radio/logo.img,a448ca280ecff44130515fbe93fb38cce0fbd1bb)
+$(call add-radio-file-sha1-checked,radio/logo.img,731a2b2138c9612f16bae1d349df21e8f57c0f15)
-$(call add-radio-file-sha1-checked,radio/mcupm.img,be062ba5b6952c11e73093dd7b6cd55062892cb8)
+$(call add-radio-file-sha1-checked,radio/mcupm.img,da8149b10103b5a188662d64045c910479512ab7)
-$(call add-radio-file-sha1-checked,radio/md1img.img,0c595b8999e38d69f6e1ec8a93a8c569ea0dba39)
+$(call add-radio-file-sha1-checked,radio/md1img.img,bf945cd86204b188793426c6fd727bd1af9b04c1)
-$(call add-radio-file-sha1-checked,radio/pi_img.img,d49bfeade6d8b7d709b22215528d2cbdf93a729b)
+$(call add-radio-file-sha1-checked,radio/pi_img.img,41725e8593fc94da72e56fb688c0858e0814b0f8)
-$(call add-radio-file-sha1-checked,radio/scp.img,503a0b4924780a65a44a62b622ebb71405b1aa73)
+$(call add-radio-file-sha1-checked,radio/scp.img,27de50acbcec659d59d1e1e3817ae2dd76f696c7)
-$(call add-radio-file-sha1-checked,radio/spmfw.img,df19212edd4c9f96391dda247601a92df0a37db6)
+$(call add-radio-file-sha1-checked,radio/spmfw.img,6b28920b124eb254c80fc41d66d7308fd995b106)
-$(call add-radio-file-sha1-checked,radio/sspm.img,66cf40d3d65ef7b23b29f460e945a65d720ce5fa)
+$(call add-radio-file-sha1-checked,radio/sspm.img,b43c3b590a23447cf3998d3b73b33d30d399ec72)
-$(call add-radio-file-sha1-checked,radio/tee.img,30505a4540fa5002766034563e8f11a84ffd7771)
+$(call add-radio-file-sha1-checked,radio/tee.img,d1de6d8701e06ab987d9d0060e00c9200792f3df)
-$(call add-radio-file-sha1-checked,radio/tkv.img,2f3600a53b076e51e023e180f358b198e285fceb)
+$(call add-radio-file-sha1-checked,radio/tkv.img,541d61271e26284231983d96e6ceb2ef82b803c4)
 
 endif

X6837-vendor.mk

@@ -853,7 +853,6 @@ PRODUCT_COPY_FILES += \
     vendor/infinix/X6837/proprietary/vendor/firmware/soc2_2_ram_wifi_1e_1_hdr.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/soc2_2_ram_wifi_1e_1_hdr.bin \
     vendor/infinix/X6837/proprietary/vendor/firmware/soc_fm_v1_coeff.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/soc_fm_v1_coeff.bin \
     vendor/infinix/X6837/proprietary/vendor/firmware/soc_fm_v1_patch.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/soc_fm_v1_patch.bin \
-    vendor/infinix/X6837/proprietary/vendor/firmware/txpowerctrl.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/txpowerctrl.cfg \
     vendor/infinix/X6837/proprietary/vendor/firmware/wifi.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi.cfg \
     vendor/infinix/X6837/proprietary/vendor/lib/egl/egl.cfg:$(TARGET_COPY_OUT_VENDOR)/lib/egl/egl.cfg
 
@@ -866,7 +865,6 @@ PRODUCT_PACKAGES += \
     libTransNS \
     libaedv \
     libbwc \
-    libccci_util \
     libgz_gp_client \
     libgz_uree \
     libhevce_sb.ca7.android \
@@ -876,9 +874,6 @@ PRODUCT_PACKAGES += \
     libipsec_ims_shr \
     libkaraoke \
     libladder \
-    libmtkcutils \
-    libmtkproperty \
-    libmtkrillog \
     libvcodec_oal \
     libvcodecdrv_header_stub \
     libverno \
@@ -1217,6 +1212,7 @@ PRODUCT_PACKAGES += \
     libcamera2ndk_vendor \
     libcares_naptr \
     libcarrierconfig \
+    libccci_util \
     libcmdl \
     libcmdl_ndk.mtk.vndk \
     libcodec2_mtk_c2store \
@@ -1273,12 +1269,15 @@ PRODUCT_PACKAGES += \
     libmtkcam_pipelinepolicy-aov \
     libmtkconfig \
     libmtkconfigutils \
+    libmtkcutils \
     libmtkhardware_legacy \
     libmtkisp_metadata \
     libmtklimiter_vendor \
     libmtkmipc-ril \
     libmtknetcap \
     libmtknetutils \
+    libmtkproperty \
+    libmtkrillog \
     libmtkrilutils \
     libmtkshifter_vendor \
     libmtksysutils \

proprietary/vendor/etc/virtual-spn-conf-by-efpnn.xml

@@ -10,7 +10,9 @@
 <virtualSpnOverride mccmncpnn="33450AT&amp;T 4G" name="AT&amp;T 4G"/>
 <virtualSpnOverride mccmncpnn="334050AT&amp;T" name="AT&amp;T"/>
 <virtualSpnOverride mccmncpnn="334050AT&amp;T 4G" name="AT&amp;T 4G"/>
+<virtualSpnOverride mccmncspn="502153UNI5G" name="UNI5G"/>
 <virtualSpnOverride mccmncspn="50503KOGAN" name="KOGAN"/>
 <virtualSpnOverride mccmncpnn="52017K4" name="K4"/>
 <virtualSpnOverride mccmncpnn="334050UNEFON" name="UNEFON"/>
+<virtualSpnOverride mccmncpnn="64003Zantel" name="Yas"/>
 </virtualSpnOverridesByEfPnn>

proprietary/vendor/etc/virtual-spn-conf-by-efspn.xml

@@ -9,6 +9,7 @@
 <virtualSpnOverride mccmncspn="20408Rabo Mobiel" name="Rabo Mobiel"/>
 <virtualSpnOverride mccmncspn="20412Lebara" name="Lebara"/>
 <virtualSpnOverride mccmncspn="20416Tele2 NL" name="Tele2 NL"/>
+<virtualSpnOverride mccmncspn="20416Odido" name="Odido"/>
 <virtualSpnOverride mccmncspn="20404CNT" name="CNT"/>
 <virtualSpnOverride mccmncspn="20606LycaMobile" name="LycaMobile"/>
 <virtualSpnOverride mccmncspn="20610LYCAMOBILE" name="LYCAMOBILE"/>
@@ -73,6 +74,7 @@
 <virtualSpnOverride mccmncspn="24801diil" name="diil"/>
 <virtualSpnOverride mccmncspn="24801Telia" name="Telia"/>
 <virtualSpnOverride mccmncspn="24802ZEN" name="ZEN"/>
+<virtualSpnOverride mccmncspn="25019Alfa" name="Alfa"/>
 <virtualSpnOverride mccmncspn="25020ROSTELECOM" name="ROSTELECOM"/>
 <virtualSpnOverride mccmncspn="25020SberMobile" name="SberMobile"/>
 <virtualSpnOverride mccmncspn="25020TTK" name="TTK"/>
@@ -132,16 +134,20 @@
 <virtualSpnOverride mccmncspn="334140VALOR" name="VALOR"/>
 <virtualSpnOverride mccmncspn="40177ALTEL 4G" name="ALTEL 4G"/>
 <virtualSpnOverride mccmncspn="40177ALTEL" name="ALTEL"/>
+<virtualSpnOverride mccmncspn="40102Activ" name="Activ"/>
 <virtualSpnOverride mccmncspn="40486VodafoneIdea" name="VodafoneIdea"/>
 <virtualSpnOverride mccmncspn="40449airtel" name="airtel"/>
 <virtualSpnOverride mccmncspn="40444Vi" name="Vi"/>
 <virtualSpnOverride mccmncspn="405799VIL" name="VIL"/>
 <virtualSpnOverride mccmncspn="405852VIL" name="VIL"/>
 <virtualSpnOverride mccmncspn="41003Onic" name="Onic"/>
+<virtualSpnOverride mccmncspn="41405U9" name="U9"/>
+<virtualSpnOverride mccmncspn="41405Ooredoo" name="U9"/>
 <virtualSpnOverride mccmncspn="41866Fastlink" name="Fastlink"/>
 <virtualSpnOverride mccmncspn="42402swyp" name="swyp"/>
 <virtualSpnOverride mccmncspn="42402five" name="five"/>
 <virtualSpnOverride mccmncspn="42501012 Mobile" name="012 Mobile"/>
+<virtualSpnOverride mccmncspn="42901Namaste" name="Namaste"/>
 <virtualSpnOverride mccmncspn="43404OQ" name="OQ"/>
 <virtualSpnOverride mccmncspn="43406PowerTel" name="Perfectum"/>
 <virtualSpnOverride mccmncspn="43407MOBIUZ" name="MOBIUZ"/>
@@ -159,6 +165,7 @@
 <virtualSpnOverride mccmncspn="204048.ta Δ" name="8.ta"/>
 <virtualSpnOverride mccmncspn="46015中国广电" name="中国广电"/>
 <virtualSpnOverride mccmncspn="46013中国广电" name="中国广电"/>
+<virtualSpnOverride mccmncspn="502153UNI5G" name="UNI5G"/>
 <virtualSpnOverride mccmncspn="51011LIVE.ON" name="LIVE.ON"/>
 <virtualSpnOverride mccmncspn="51001ISAT-PEMILUDAMAI" name="Indosat Ooredoo"/>
 <virtualSpnOverride mccmncspn="51502GOMO" name="GOMO"/>
@@ -168,10 +175,12 @@
 <virtualSpnOverride mccmncspn="52017K4" name="K4"/>
 <virtualSpnOverride mccmncspn="52017TOTmobile" name="TOTmobile"/>
 <virtualSpnOverride mccmncspn="60204we" name="we"/>
+<virtualSpnOverride mccmncspn="62130MTN-NG" name="MTN NG"/>
 <virtualSpnOverride mccmncspn="62405blue" name="blue"/>
 <virtualSpnOverride mccmncspn="63903Equitel" name="Equitel"/>
 <virtualSpnOverride mccmncspn="64002TIGO" name="Yas"/>
 <virtualSpnOverride mccmncspn="64002Yas" name="Yas"/>
+<virtualSpnOverride mccmncspn="64002YAS" name="Yas"/>
 <virtualSpnOverride mccmncspn="64003Zantel" name="Yas"/>
 <virtualSpnOverride mccmncspn="65501Mr Price Mobile" name="Mr Price Mobile"/>
 <virtualSpnOverride mccmncspn="65507k&apos;nect mobile" name="k&apos;nect mobile"/>
@@ -213,5 +222,6 @@
 <!-- yj:modify for X6532COP-2163 by linlin.yang 20240927 end -->
 <virtualSpnOverride mccmncspn="74000Tuenti" name="Tuenti"/>
 <virtualSpnOverride mccmncspn="74000MaxiPlus" name="MaxiPlus"/>
+<virtualSpnOverride mccmncspn="74000AkiMovil" name="AkiMovil"/>
 <virtualSpnOverride mccmncspn="99999airtel 5G trial" name="Airtel"/>
 </virtualSpnOverridesByEfSpn>

proprietary/vendor/firmware/txpowerctrl.cfg

@@ -1,3 +0,0 @@
-ce_head_off;1;2;1;[2G4,34,34,31,31,30,60,60,60,60][5G,31,31,28,30,27,29,26,16,16]
-ce_body_off;1;2;1;[2G4,34,34,31,31,30,60,60,60,60][5G,31,31,28,30,27,29,26,16,16]
-id_head_off;1;2;1;[2G4,36,60,60,60,60,60,60,60,60]

proprietary/vendor/firmware/wifi.cfg

@@ -1,4 +1,4 @@
-AntSwapAntMode 1
+AntSwapAntMode 0
 Sta2gBw 0
 RoamingRCPIPoorValue 64
 RoamingRCPIGoodValue 64
@@ -7,7 +7,6 @@ WmmParamCwMin 2
 WmmParamAifsN 2
 WmmParamTxOp 520
 WmmParamCfgEn 1
-PowerLimit 3
 EdccaTh5gBw20 0xFFAB
 EdccaTh5gBw40 0xFFAC
 EdccaTh5gBw80 0xFFAD