rosemary: Sync with DT

rosemary: Update VT from rothko A16
rosemary: Link Audio HAL against V33 libstagefright_foundation
Revert "rosemary: Update blobs from `V14.0.11.0.TKLMIXM`"

Android.bp

@@ -8,7 +8,6 @@ soong_namespace {
         "hardware/mediatek/libmtkperf_client",
         "hardware/xiaomi",
         "vendor/xiaomi/rosemary",
-        "device/xiaomi/rosemary",
     ],
 }
 
@@ -200,58 +199,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "android.hardware.thermal@2.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/android.hardware.thermal@2.0-impl.so",
-            ],
-            shared_libs: [
-                "libc",
-                "liblog",
-                "libhardware",
-                "libbase",
-                "libcutils",
-                "libutils",
-                "libhidlbase",
-                "android.hardware.thermal@1.0",
-                "android.hardware.thermal@2.0",
-                "libc++",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/android.hardware.thermal@2.0-impl.so",
-            ],
-            shared_libs: [
-                "libc",
-                "liblog",
-                "libhardware",
-                "libbase",
-                "libcutils",
-                "libutils",
-                "libhidlbase",
-                "android.hardware.thermal@1.0",
-                "android.hardware.thermal@2.0",
-                "libc++",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "audio.primary.mt6785",
     owner: "xiaomi",
@@ -264,6 +211,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/hw/audio.primary.mt6785.so",
             ],
             shared_libs: [
+                "libstagefright_foundation-v33",
                 "libhidlbase",
                 "vendor.mediatek.hardware.mtkpower@1.0",
                 "liblog",
@@ -6337,34 +6285,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "thermal_hal",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/thermal_hal.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libhardware",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.mediatek.hardware.camera.atms@1.0-impl",
     owner: "xiaomi",
@@ -20844,22 +20764,22 @@ cc_prebuilt_library_shared {
                 "libSonyIMX386PdafLibraryWrapper",
                 "libSonyIMX338PdafLibraryWrapper",
                 "libSonyIMX519PdafLibraryWrapper",
-                "ov64b40semco_mipi_raw_india_IdxMgr",
                 "ov64b40semco_mipi_raw_IdxMgr",
-                "ov64b40ofilm_mipi_raw_india_IdxMgr",
+                "ov64b40semco_mipi_raw_india_IdxMgr",
                 "ov64b40ofilm_mipi_raw_IdxMgr",
+                "ov64b40ofilm_mipi_raw_india_IdxMgr",
                 "ov13b10sunny_mipi_raw_IdxMgr",
                 "ov13b10sunny_mipi_raw_india_IdxMgr",
-                "ov13b10ofilm_mipi_raw_IdxMgr",
                 "ov13b10ofilm_mipi_raw_india_IdxMgr",
+                "ov13b10ofilm_mipi_raw_IdxMgr",
                 "imx355ofilm_mipi_raw_IdxMgr",
                 "imx355ofilm_mipi_raw_india_IdxMgr",
                 "imx355sunny_mipi_raw_india_IdxMgr",
                 "imx355sunny_mipi_raw_IdxMgr",
-                "ov02b1bofilm_mipi_raw_IdxMgr",
                 "ov02b1bofilm_mipi_raw_india_IdxMgr",
-                "gc02m1ofilm_mipi_raw_india_IdxMgr",
+                "ov02b1bofilm_mipi_raw_IdxMgr",
                 "gc02m1ofilm_mipi_raw_IdxMgr",
+                "gc02m1ofilm_mipi_raw_india_IdxMgr",
                 "gc02m1sunny_mipi_raw_IdxMgr",
                 "gc02m1sunny_mipi_raw_india_IdxMgr",
                 "gc02m1bsunny_mipi_mono_IdxMgr",
@@ -24411,7 +24331,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libsync",
                 "libcutils",
-                "libui",
+                "libui-v34",
                 "libmtkcam_stdutils",
                 "libmtkcam_ulog",
                 "libhidlbase",
@@ -30134,7 +30054,6 @@ cc_prebuilt_library_shared {
                 "proprietary/system_ext/lib64/libsink-mtk.so",
             ],
             shared_libs: [
-                "libshim_sink",
                 "libbinder",
                 "libcutils",
                 "libgui",
@@ -30173,7 +30092,6 @@ cc_prebuilt_library_shared {
                 "proprietary/system_ext/lib64/libsource.so",
             ],
             shared_libs: [
-                "libui_shim",
                 "libbinder",
                 "libcutils",
                 "libgui",
@@ -31196,39 +31114,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "android.hardware.thermal@2.0-service.mtk",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/hw/android.hardware.thermal@2.0-service.mtk",
-            ],
-            shared_libs: [
-                "libc",
-                "liblog",
-                "libhardware",
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libutils",
-                "android.hardware.thermal@2.0",
-                "android.hardware.thermal@1.0",
-                "libc++",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    relative_install_path: "hw",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "camerahalserver",
     owner: "xiaomi",

Android.mk

@@ -12,8 +12,8 @@ $(call add-radio-file-sha1-checked,radio/cam_vpu2.img,3dd4b80ac5fc08785ae0650cf2
 $(call add-radio-file-sha1-checked,radio/cam_vpu3.img,6f778d6a013bf1344dc9d5523d2239f4463c4a97)
 $(call add-radio-file-sha1-checked,radio/gz.img,d0f422d8065108334dd5c0187240e47da31dd127)
 $(call add-radio-file-sha1-checked,radio/lk.img,a20bb452beb717086eb4b1cd4af4d1416a53fd1c)
-$(call add-radio-file-sha1-checked,radio/md1img.img,45cc7a88c2aef2963d76418c1047ddaf389bf995)
-$(call add-radio-file-sha1-checked,radio/preloader_raw.img,d79e645a8d415deb1386abbbe604206de03f5471)
+$(call add-radio-file-sha1-checked,radio/md1img.img,5b63902f0e200bda1af8559e34d6bb62a9851d61)
+$(call add-radio-file-sha1-checked,radio/preloader_raw.img,c520a92ad056215e6e9d16cb4c234f3f37644c41)
 $(call add-radio-file-sha1-checked,radio/scp.img,90b7fafaf3c5e39060b684b8db788c13b32fdd5d)
 $(call add-radio-file-sha1-checked,radio/spmfw.img,ea7cfb679b22fea131fbe894932fb9590836e845)
 $(call add-radio-file-sha1-checked,radio/sspm.img,9ef7f3d01b3df910c6a3ac2406a4b98e394c952e)

proprietary/vendor/etc/ecc_list.xml

@@ -289,9 +289,6 @@
     <!-- Support dial 999 under G+N/A case because CT network don't support
          dial 999 without no CT SIM
     -->
-    <EccEntry Ecc="000" Category="0" Condition="1" Plmn="460 FFF"/>
-    <EccEntry Ecc="08" Category="0" Condition="1" Plmn="460 FFF"/>
-    <EccEntry Ecc="118" Category="0" Condition="1" Plmn="460 FFF"/>
     <EccEntry Ecc="999" Category="0" Condition="2" Plmn="460 FFF"/>
     <EccEntry Ecc="118" Category="0" Condition="2" Plmn="466 FFF"/>
     
@@ -442,6 +439,7 @@
     <EccEntry Ecc="911" Category="0" Condition="1" Plmn="716 FFF"/>
     <EccEntry Ecc="105" Category="0" Condition="1" Plmn="716 06"/>
     <EccEntry Ecc="105" Category="0" Condition="1" Plmn="716 10"/>
+    <EccEntry Ecc="000" Category="0" Condition="0" Plmn="716 17"/>
 
     <EccEntry Ecc="999" Category="0" Condition="1" Plmn="234 FFF"/>
     <EccEntry Ecc="112" Category="0" Condition="1" Plmn="234 FFF"/>

proprietary/vendor/etc/init/android.hardware.thermal@2.0-service.mtk.rc

@@ -1,7 +0,0 @@
-service vendor.thermal-hal-2-0.mtk /vendor/bin/hw/android.hardware.thermal@2.0-service.mtk
-    interface android.hardware.thermal@1.0::IThermal default
-    interface android.hardware.thermal@2.0::IThermal default
-    socket thermal_hal_socket stream 660 root system
-    class hal
-    user system
-    group system

proprietary/vendor/etc/init/init.md_apps.rc

@@ -1,6 +1,6 @@
 on boot
      setprop ro.vendor.md_apps.support 1
      setprop ro.vendor.md_apps.load_type user
-     setprop ro.vendor.md_apps.load_verno "MOLY.LR13.R1.MP.V89.6.P77"
+     setprop ro.vendor.md_apps.load_verno "MOLY.LR13.R1.MP.V89.6.P64"
      setprop ro.vendor.md_apps.load_gencfg "GEN95_USER"
-     setprop ro.vendor.md_apps.load_date "2024/07/09 10:32:02 GMT +00:00"
+     setprop ro.vendor.md_apps.load_date "2023/09/15 07:07:54 GMT +00:00"

rosemary-vendor.mk

@@ -196,7 +196,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.media.c2@1.2-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.media.c2@1.2-mediatek.rc \
     vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc \
     vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc \
-    vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.thermal@2.0-service.mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.thermal@2.0-service.mtk.rc \
     vendor/xiaomi/rosemary/proprietary/vendor/etc/init/audiocmdservice_atci.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/audiocmdservice_atci.rc \
     vendor/xiaomi/rosemary/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \
     vendor/xiaomi/rosemary/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \
@@ -552,7 +551,6 @@ PRODUCT_PACKAGES += \
     android.hardware.audio@6.0-impl-mediatek \
     android.hardware.audio@7.0-impl-mediatek \
     android.hardware.bluetooth@1.1-impl-mediatek \
-    android.hardware.thermal@2.0-impl \
     audio.primary.mt6785 \
     audio.r_submix.mt6785 \
     consumerir.mt6785 \
@@ -711,7 +709,6 @@ PRODUCT_PACKAGES += \
     libSoftGatekeeper \
     sensors.elliptic \
     sensors.mt6785 \
-    thermal_hal \
     vendor.mediatek.hardware.camera.atms@1.0-impl \
     vendor.mediatek.hardware.camera.bgservice@1.1-impl \
     vendor.mediatek.hardware.camera.isphal@1.0-impl \
@@ -1613,7 +1610,6 @@ PRODUCT_PACKAGES += \
     android.hardware.media.c2@1.2-mediatek-64b \
     android.hardware.neuralnetworks@1.3-service-mtk-neuron \
     android.hardware.secure_element@1.2-service-mediatek \
-    android.hardware.thermal@2.0-service.mtk \
     camerahalserver \
     mtkfusionrild \
     tetheroffloadservice \