diff --git a/Android.bp b/Android.bp
index 585d533..30e2f3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -216,6 +216,188 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "c2.dolby.client",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/c2.dolby.client.so",
+            ],
+            shared_libs: [
+                "android.hardware.media.c2-V1-ndk",
+                "libbinder_ndk",
+                "libcodec2_aidl",
+                "libstagefright_aidl_bufferpool2",
+                "server_configurable_flags",
+                "libaconfig_storage_read_api_cc",
+                "libbase",
+                "liblog",
+                "libcodec2",
+                "libcodec2_hal_common",
+                "libcodec2_vndk",
+                "libutils",
+                "android.hardware.media.c2@1.0",
+                "libcodec2_hidl@1.0",
+                "libhidlbase",
+                "libcutils",
+                "libstagefright_bufferpool@2.0.1",
+                "libnativewindow",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "c2.dolby.hevc.dec",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/c2.dolby.hevc.dec.so",
+            ],
+            shared_libs: [
+                "libdolbyottcameracontrol",
+                "libsensorndkbridge",
+                "android.hardware.media.c2-V1-ndk",
+                "libbinder_ndk",
+                "libcodec2_aidl",
+                "libstagefright_aidl_bufferpool2",
+                "server_configurable_flags",
+                "libaconfig_storage_read_api_cc",
+                "libcodec2_hal_common",
+                "android.hardware.media.c2@1.0",
+                "libcodec2_hidl@1.0",
+                "libcodec2_soft_common",
+                "libcutils",
+                "libsfplugin_ccodec_utils",
+                "libstagefright_foundation",
+                "libbase",
+                "liblog",
+                "libcodec2",
+                "libcodec2_vndk",
+                "libutils",
+                "libEGL",
+                "libGLESv3",
+                "c2.dolby.store",
+                "c2.dolby.client",
+                "libstagefright_bufferpool@2.0.1",
+                "libdolbydecoderprocessor",
+                "libui",
+                "libhidlbase",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "c2.dolby.hevc.sec.dec",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so",
+            ],
+            shared_libs: [
+                "libdolbyottcameracontrol",
+                "libsensorndkbridge",
+                "android.hardware.media.c2-V1-ndk",
+                "libbinder_ndk",
+                "libcodec2_aidl",
+                "libstagefright_aidl_bufferpool2",
+                "server_configurable_flags",
+                "libaconfig_storage_read_api_cc",
+                "libcodec2_hal_common",
+                "android.hardware.media.c2@1.0",
+                "libcodec2_hidl@1.0",
+                "libcodec2_soft_common",
+                "libcutils",
+                "libsfplugin_ccodec_utils",
+                "libstagefright_foundation",
+                "libbase",
+                "liblog",
+                "libcodec2",
+                "libcodec2_vndk",
+                "libutils",
+                "libEGL",
+                "libGLESv3",
+                "c2.dolby.store",
+                "c2.dolby.client",
+                "libstagefright_bufferpool@2.0.1",
+                "libdolbydecoderprocessor",
+                "libui",
+                "libhidlbase",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "c2.dolby.store",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/c2.dolby.store.so",
+            ],
+            shared_libs: [
+                "server_configurable_flags",
+                "libaconfig_storage_read_api_cc",
+                "libbase",
+                "libcodec2",
+                "libcodec2_hal_common",
+                "libcodec2_vndk",
+                "libutils",
+                "android.hardware.media.c2@1.0",
+                "libcodec2_hidl@1.0",
+                "liblog",
+                "libcutils",
+                "libdmabufheap",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "com.xiaomi.camdfx",
     owner: "xiaomi",
@@ -5541,6 +5723,100 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libdolbydecoderprocessor",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libdolbydecoderprocessor.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libEGL",
+                "libGLESv2",
+                "libui",
+                "libutils",
+                "libstagefright_foundation",
+                "libcutils",
+                "libdolbyottcameracontrol",
+                "libhidlbase",
+                "libnativewindow",
+                "libdolbyeglcore",
+                "libcodec2_vndk",
+                "libcodec2",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libdolbyeglcore",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libdolbyeglcore.so",
+            ],
+            shared_libs: [
+                "libEGL",
+                "libGLESv3",
+                "libnativewindow",
+                "libcutils",
+                "liblog",
+                "libutils",
+                "libui",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libdolbyottcameracontrol",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libdolbyottcameracontrol.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libGLESv3",
+                "libEGL",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libecoengine",
     owner: "xiaomi",
@@ -35153,25 +35429,25 @@ android_app_import {
 android_app_import {
     name: "HotwordEnrollmentXGoogleRISCV_WIDEBAND",
     owner: "xiaomi",
-    apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk",
+    apk: "proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk",
     certificate: "platform",
     dex_preopt: {
         enabled: false,
     },
     privileged: true,
-    product_specific: true,
+    system_ext_specific: true,
 }
 
 android_app_import {
     name: "HotwordEnrollmentYGoogleRISCV_WIDEBAND",
     owner: "xiaomi",
-    apk: "proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk",
+    apk: "proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk",
     certificate: "platform",
     dex_preopt: {
         enabled: false,
     },
     privileged: true,
-    product_specific: true,
+    system_ext_specific: true,
 }
 
 android_app_import {
@@ -35240,46 +35516,6 @@ dex_import {
     ],
 }
 
-dex_import {
-    name: "mediatek-ims-base",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system/framework/mediatek-ims-base.jar",
-    ],
-}
-
-dex_import {
-    name: "mediatek-ims-common",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system/framework/mediatek-ims-common.jar",
-    ],
-}
-
-dex_import {
-    name: "mediatek-telecom-common",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system/framework/mediatek-telecom-common.jar",
-    ],
-}
-
-dex_import {
-    name: "mediatek-telephony-base",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system/framework/mediatek-telephony-base.jar",
-    ],
-}
-
-dex_import {
-    name: "mediatek-telephony-common",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system/framework/mediatek-telephony-common.jar",
-    ],
-}
-
 dex_import {
     name: "androidx.camera.extensions.impl",
     owner: "xiaomi",
@@ -35298,6 +35534,26 @@ dex_import {
     system_ext_specific: true,
 }
 
+dex_import {
+    name: "mediatek-ims-base",
+    owner: "xiaomi",
+    jars: [
+        "proprietary/system_ext/framework/mediatek-ims-base.jar",
+    ],
+    system_ext_specific: true,
+    use_generic_config: true,
+}
+
+dex_import {
+    name: "mediatek-ims-common",
+    owner: "xiaomi",
+    jars: [
+        "proprietary/system_ext/framework/mediatek-ims-common.jar",
+    ],
+    system_ext_specific: true,
+    use_generic_config: true,
+}
+
 dex_import {
     name: "mediatek-ims-extension-plugin",
     owner: "xiaomi",
@@ -35307,6 +35563,36 @@ dex_import {
     system_ext_specific: true,
 }
 
+dex_import {
+    name: "mediatek-telecom-common",
+    owner: "xiaomi",
+    jars: [
+        "proprietary/system_ext/framework/mediatek-telecom-common.jar",
+    ],
+    system_ext_specific: true,
+    use_generic_config: true,
+}
+
+dex_import {
+    name: "mediatek-telephony-base",
+    owner: "xiaomi",
+    jars: [
+        "proprietary/system_ext/framework/mediatek-telephony-base.jar",
+    ],
+    system_ext_specific: true,
+    use_generic_config: true,
+}
+
+dex_import {
+    name: "mediatek-telephony-common",
+    owner: "xiaomi",
+    jars: [
+        "proprietary/system_ext/framework/mediatek-telephony-common.jar",
+    ],
+    system_ext_specific: true,
+    use_generic_config: true,
+}
+
 prebuilt_etc_xml {
     name: "CommandService.xml",
     owner: "xiaomi",
@@ -36482,6 +36768,49 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "vendor.dolby.media.c2-service-vision",
+    owner: "xiaomi",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision",
+            ],
+            shared_libs: [
+                "android.hardware.media.c2-V1-ndk",
+                "libbinder_ndk",
+                "libcodec2_aidl",
+                "libstagefright_aidl_bufferpool2",
+                "server_configurable_flags",
+                "libaconfig_storage_read_api_cc",
+                "libbase",
+                "liblog",
+                "libcodec2",
+                "libcodec2_hal_common",
+                "libcodec2_vndk",
+                "libutils",
+                "android.hardware.media.c2@1.0",
+                "libcodec2_hidl@1.0",
+                "libbinder",
+                "libhidlbase",
+                "c2.dolby.store",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    relative_install_path: "hw",
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "vendor.mediatek.hardware.gnss-service",
     owner: "xiaomi",
@@ -37302,202 +37631,6 @@ cc_prebuilt_binary {
     system_ext_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "spkcal",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libcutils",
-                "libutils",
-                "libandroid_runtime",
-                "libnativehelper",
-                "libaudioclient",
-                "libmediandk",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libtinyalsa",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_binary {
-    name: "spkcal_88263s",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal_88263s",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libcutils",
-                "libaudioclient",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_binary {
-    name: "spkcal_88263s_m16",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal_88263s_m16",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libcutils",
-                "libaudioclient",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_binary {
-    name: "spkcal_88263s_m9",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal_88263s_m9",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libcutils",
-                "libaudioclient",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_binary {
-    name: "spkcal_88263s_n12",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal_88263s_n12",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libcutils",
-                "libaudioclient",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_binary {
-    name: "spkcal_88263s_n12a",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal_88263s_n12a",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libcutils",
-                "libaudioclient",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "spkcal_88263s_o10",
     owner: "xiaomi",
@@ -37530,39 +37663,6 @@ cc_prebuilt_binary {
     system_ext_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "spkcal_tfa",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/bin/spkcal_tfa",
-            ],
-            shared_libs: [
-                "libstagefright",
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libstagefright_foundation",
-                "libmedia",
-                "libcutils",
-                "libtfa98xx_cal",
-                "libaudioclient",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "vtservice",
     owner: "xiaomi",
diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk
deleted file mode 100644
index 314d62a..0000000
Binary files a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk and /dev/null differ
diff --git a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk
deleted file mode 100644
index e98303c..0000000
Binary files a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk and /dev/null differ
diff --git a/proprietary/system_ext/bin/spkcal b/proprietary/system_ext/bin/spkcal
deleted file mode 100755
index 2652af6..0000000
Binary files a/proprietary/system_ext/bin/spkcal and /dev/null differ
diff --git a/proprietary/system_ext/bin/spkcal_88263s b/proprietary/system_ext/bin/spkcal_88263s
deleted file mode 100755
index b52c668..0000000
Binary files a/proprietary/system_ext/bin/spkcal_88263s and /dev/null differ
diff --git a/proprietary/system_ext/bin/spkcal_88263s_m16 b/proprietary/system_ext/bin/spkcal_88263s_m16
deleted file mode 100755
index 34fc198..0000000
Binary files a/proprietary/system_ext/bin/spkcal_88263s_m16 and /dev/null differ
diff --git a/proprietary/system_ext/bin/spkcal_88263s_m9 b/proprietary/system_ext/bin/spkcal_88263s_m9
deleted file mode 100755
index da9ec95..0000000
Binary files a/proprietary/system_ext/bin/spkcal_88263s_m9 and /dev/null differ
diff --git a/proprietary/system_ext/bin/spkcal_88263s_n12 b/proprietary/system_ext/bin/spkcal_88263s_n12
deleted file mode 100755
index 55f4019..0000000
Binary files a/proprietary/system_ext/bin/spkcal_88263s_n12 and /dev/null differ
diff --git a/proprietary/system_ext/bin/spkcal_88263s_n12a b/proprietary/system_ext/bin/spkcal_88263s_n12a
deleted file mode 100755
index 000a496..0000000
Binary files a/proprietary/system_ext/bin/spkcal_88263s_n12a and /dev/null differ
diff --git a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar
index b09df01..e4ebe4e 100644
Binary files a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar and b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar differ
diff --git a/proprietary/system/framework/mediatek-ims-base.jar b/proprietary/system_ext/framework/mediatek-ims-base.jar
similarity index 100%
rename from proprietary/system/framework/mediatek-ims-base.jar
rename to proprietary/system_ext/framework/mediatek-ims-base.jar
diff --git a/proprietary/system/framework/mediatek-ims-common.jar b/proprietary/system_ext/framework/mediatek-ims-common.jar
similarity index 100%
rename from proprietary/system/framework/mediatek-ims-common.jar
rename to proprietary/system_ext/framework/mediatek-ims-common.jar
diff --git a/proprietary/system/framework/mediatek-telecom-common.jar b/proprietary/system_ext/framework/mediatek-telecom-common.jar
similarity index 100%
rename from proprietary/system/framework/mediatek-telecom-common.jar
rename to proprietary/system_ext/framework/mediatek-telecom-common.jar
diff --git a/proprietary/system/framework/mediatek-telephony-base.jar b/proprietary/system_ext/framework/mediatek-telephony-base.jar
similarity index 100%
rename from proprietary/system/framework/mediatek-telephony-base.jar
rename to proprietary/system_ext/framework/mediatek-telephony-base.jar
diff --git a/proprietary/system/framework/mediatek-telephony-common.jar b/proprietary/system_ext/framework/mediatek-telephony-common.jar
similarity index 100%
rename from proprietary/system/framework/mediatek-telephony-common.jar
rename to proprietary/system_ext/framework/mediatek-telephony-common.jar
diff --git a/proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk b/proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk
new file mode 100644
index 0000000..2bc258f
Binary files /dev/null and b/proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk differ
diff --git a/proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk b/proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk
new file mode 100644
index 0000000..28976a0
Binary files /dev/null and b/proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk differ
diff --git a/proprietary/system_ext/bin/spkcal_tfa b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision
similarity index 57%
rename from proprietary/system_ext/bin/spkcal_tfa
rename to proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision
index a05aace..bc20780 100755
Binary files a/proprietary/system_ext/bin/spkcal_tfa and b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision differ
diff --git a/proprietary/vendor/etc/dolby_vision.cfg b/proprietary/vendor/etc/dolby_vision.cfg
new file mode 100644
index 0000000..157a9cc
--- /dev/null
+++ b/proprietary/vendor/etc/dolby_vision.cfg
@@ -0,0 +1,52 @@
+# Dolby Vision Display Management Configuration File
+# Path : ./vendor/etc/dolby_vision.cfg
+# Date : 09/03/2024
+# Display : OLED 6.7 inch 1220x2712
+# Brand Model Number: Xiaomi O10 rodin 2412DRT0AC
+
+#Configuration Start
+[Display]
+ID = 0
+Width = 1220
+Height = 2712
+
+[Global]
+ReferenceDarkPicModeIndex = 2
+IDK_Version = SW_4.5.2
+DMSwVersion = 4.0
+DeviceModelName = NULL
+DefaultOutputFormat = YUV
+
+Tmax = 1250
+Tmin = 0.0001
+TPrimaries = 0.68 0.32 0.265 0.69 0.15 0.06 0.3127 0.329
+TEOTF = POWER
+Tgamma = 2.3
+
+BLUPwm = 83	131	175	216	255
+BLULight = 295.2	477.8	686.2	944.5	1250
+BLULightMin = 0.0001 0.0001 0.0001 0.0001 0.0001
+
+Ambient = 3
+TSurroundReflection = 0.5
+TScreenReflection = 0.0005
+ALDelayMilliSec = 50
+ALResponseFall = 0.04
+ALResponseRise = 0.2
+ALOperationalRate = 50
+TFrontLux = 1000
+TFrontLuxScale = 1
+
+[PictureMode = 0]
+PictureModeName = Dolby Vision Bright
+DBrightness = 0.3
+
+[PictureMode = 1]
+PictureModeName = Dolby Vision Vivid
+DBrightness = 0.3
+
+[PictureMode = 2]
+PictureModeName = Dolby Vision Dark
+SupportsDM3 = 1
+Ambient = 0
+#Configuration End
diff --git a/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc b/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc
new file mode 100644
index 0000000..546c2a5
--- /dev/null
+++ b/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc
@@ -0,0 +1,6 @@
+service vendor.dolby.media.c2-service-vision /vendor/bin/hw/vendor.dolby.media.c2-service-vision
+    class hal
+    user mediacodec
+    group camera mediadrm drmrpc
+    ioprio rt 4
+    writepid /dev/cpuset/foreground/tasks
diff --git a/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml
new file mode 100644
index 0000000..0a0f067
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<permissions>
+    <feature name="com.mediatek.hardware.vow.gva.tflite"/>
+</permissions>
diff --git a/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml
new file mode 100644
index 0000000..a46edaa
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<permissions>
+    <feature name="com.mediatek.hardware.vow.2e2k"/>
+</permissions>
diff --git a/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml
new file mode 100644
index 0000000..0b88159
--- /dev/null
+++ b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<permissions>
+    <feature name="com.mediatek.hardware.vow_dsp.riscv"/>
+</permissions>
diff --git a/proprietary/vendor/lib64/c2.dolby.client.so b/proprietary/vendor/lib64/c2.dolby.client.so
new file mode 100644
index 0000000..d7358ac
Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.client.so differ
diff --git a/proprietary/vendor/lib64/c2.dolby.hevc.dec.so b/proprietary/vendor/lib64/c2.dolby.hevc.dec.so
new file mode 100644
index 0000000..ca60b68
Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.hevc.dec.so differ
diff --git a/proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so b/proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so
new file mode 100644
index 0000000..bee9dd0
Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so differ
diff --git a/proprietary/vendor/lib64/c2.dolby.store.so b/proprietary/vendor/lib64/c2.dolby.store.so
new file mode 100644
index 0000000..847f33b
Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.store.so differ
diff --git a/proprietary/vendor/lib64/libdolbydecoderprocessor.so b/proprietary/vendor/lib64/libdolbydecoderprocessor.so
new file mode 100644
index 0000000..f9c7b48
Binary files /dev/null and b/proprietary/vendor/lib64/libdolbydecoderprocessor.so differ
diff --git a/proprietary/vendor/lib64/libdolbyeglcore.so b/proprietary/vendor/lib64/libdolbyeglcore.so
new file mode 100644
index 0000000..cced54e
Binary files /dev/null and b/proprietary/vendor/lib64/libdolbyeglcore.so differ
diff --git a/proprietary/vendor/lib64/libdolbyottcameracontrol.so b/proprietary/vendor/lib64/libdolbyottcameracontrol.so
new file mode 100644
index 0000000..0565cf0
Binary files /dev/null and b/proprietary/vendor/lib64/libdolbyottcameracontrol.so differ
diff --git a/rodin-vendor.mk b/rodin-vendor.mk
index e4cee13..70434b7 100644
--- a/rodin-vendor.mk
+++ b/rodin-vendor.mk
@@ -495,6 +495,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-fs19xx-spatializer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-fs19xx-spatializer.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-fs19xx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-fs19xx.xml \
+    vendor/xiaomi/rodin/proprietary/vendor/etc/dolby_vision.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/dolby_vision.cfg \
     vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/elliptic_sensor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/elliptic_sensor.xml \
@@ -559,6 +560,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/tee-supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee-supplicant.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/touch_boost.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/touch_boost.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.dolby.media.c2-default-service-dax.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.media.c2-default-service-dax.rc \
+    vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.media.c2-service-vision.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.mediatek.hardware.mmagent-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mmagent-service.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.mediatek.hardware.mmlpq@V1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mmlpq@V1-service.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.mediatek.hardware.mms-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mms-service.rc \
@@ -660,6 +662,9 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/rodin/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \
     vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/android.hardware.identity_credential.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.identity_credential.mitee.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/camera_extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/camera_extensions.xml \
+    vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml \
+    vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.mediatek.hardware.vow.xml \
+    vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.mediatek.hardware.vow_dsp.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/pq_flag.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pq_flag.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/sensor_diag.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/sensor_diag.cfg \
     vendor/xiaomi/rodin/proprietary/vendor/etc/slp_conf:$(TARGET_COPY_OUT_VENDOR)/etc/slp_conf \
@@ -811,6 +816,10 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.core-impl-mediatek \
     android.hardware.bluetooth.audio-impl-mediatek \
     android.hardware.security.keymint-V3-ndk-v35 \
+    c2.dolby.client \
+    c2.dolby.hevc.dec \
+    c2.dolby.hevc.sec.dec \
+    c2.dolby.store \
     com.xiaomi.camdfx \
     com.xiaomi.immunesystem.bigdata \
     com.xiaomi.immunesystem.bigdata2 \
@@ -977,6 +986,9 @@ PRODUCT_PACKAGES += \
     libdlbdsservice \
     libdlbpreg \
     libdmshal \
+    libdolbydecoderprocessor \
+    libdolbyeglcore \
+    libdolbyottcameracontrol \
     libecoengine \
     libfeature.hdr10 \
     libfeaturepolicy \
@@ -1896,14 +1908,14 @@ PRODUCT_PACKAGES += \
     JVFactoryTest \
     goodix_sz_rodin \
     camerax-vendor-extensions \
+    androidx.camera.extensions.impl \
+    com.android.hotwordenrollment.common.util \
     mediatek-ims-base \
     mediatek-ims-common \
+    mediatek-ims-extension-plugin \
     mediatek-telecom-common \
     mediatek-telephony-base \
     mediatek-telephony-common \
-    androidx.camera.extensions.impl \
-    com.android.hotwordenrollment.common.util \
-    mediatek-ims-extension-plugin \
     CommandService.xml \
     android.hardware.audio.effect.service-aidl.xml \
     android.hardware.audio.service-aidl.mediatek.xml \
@@ -1966,6 +1978,7 @@ PRODUCT_PACKAGES += \
     tetheroffloadservice \
     vendor.dolby.dms.service \
     vendor.dolby.media.c2-default-service-dax \
+    vendor.dolby.media.c2-service-vision \
     vendor.mediatek.hardware.gnss-service \
     vendor.mediatek.hardware.gpuserv-service \
     vendor.mediatek.hardware.mmagent-service \
@@ -1993,14 +2006,7 @@ PRODUCT_PACKAGES += \
     wmt_launcher \
     wmt_loader \
     android.hardware.audio.parameter_parser.service \
-    spkcal \
-    spkcal_88263s \
-    spkcal_88263s_m16 \
-    spkcal_88263s_m9 \
-    spkcal_88263s_n12 \
-    spkcal_88263s_n12a \
     spkcal_88263s_o10 \
-    spkcal_tfa \
     vtservice \
     fidoca_mitee \
     vendor.xiaomi.hw.touchfeature-service \
@@ -2472,8 +2478,8 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_BOOT_JARS += \
     camerax-vendor-extensions \
-    mediatek-ims-base \
-    mediatek-ims-common \
-    mediatek-telecom-common \
-    mediatek-telephony-base \
-    mediatek-telephony-common
+    system_ext:mediatek-ims-base \
+    system_ext:mediatek-ims-common \
+    system_ext:mediatek-telecom-common \
+    system_ext:mediatek-telephony-base \
+    system_ext:mediatek-telephony-common