s5e8825-common: Drop EPIC HAL

Change-Id: I56f9ce636463f5f2125bb5cfda67a0d839cda389 Signed-off-by: Majaahh <maja.blaszczak@proton.me>
2025-12-06 15:28:47 +03:00
45 changed files with 282 additions and 388 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -989,32 +989,6 @@ cc_prebuilt_library_shared {
    soc_specific: true,
 }

-cc_prebuilt_library_shared {
-    name: "libprotobuf-cpp-full-21.7",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so",
-            ],
-            shared_libs: [
-                "libz",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
    name: "libqfp_sensortest",
    owner: "samsung",
@@ -1083,16 +1057,19 @@ cc_prebuilt_library_shared {
                "proprietary/vendor/lib64/libril_sem.so",
            ],
            shared_libs: [
+                "libhidlbase",
+                "android.hardware.radio@1.0",
+                "android.hardware.radio@1.1",
+                "android.hardware.radio@1.2",
                "libbase",
                "libbinder_ndk",
-                "android.hardware.radio.config-V2-ndk",
-                "android.hardware.radio.data-V2-ndk",
-                "android.hardware.radio.messaging-V2-ndk",
-                "android.hardware.radio.modem-V2-ndk",
-                "android.hardware.radio.network-V2-ndk",
-                "android.hardware.radio.sap-V1-ndk",
-                "android.hardware.radio.sim-V2-ndk",
-                "android.hardware.radio.voice-V2-ndk",
+                "android.hardware.radio.config-V1-ndk",
+                "android.hardware.radio.data-V1-ndk",
+                "android.hardware.radio.messaging-V1-ndk",
+                "android.hardware.radio.modem-V1-ndk",
+                "android.hardware.radio.network-V1-ndk",
+                "android.hardware.radio.sim-V1-ndk",
+                "android.hardware.radio.voice-V1-ndk",
                "vendor.samsung.hardware.radio.bridge-V1-ndk",
                "vendor.samsung.hardware.radio.data-V1-ndk",
                "vendor.samsung.hardware.radio.messaging-V1-ndk",
@@ -1142,7 +1119,7 @@ cc_prebuilt_library_shared {
                "libjsoncpp",
                "libVendorSemTelephonyProps",
                "libVendorSemDataProps",
-                "libprotobuf-cpp-full-21.7",
+                "libprotobuf-cpp-full-3.9.1-vendorcompat",
                "libvkmanager_vendor",
                "libengmode_client",
                "libbase",
@@ -1399,7 +1376,6 @@ cc_prebuilt_library_shared {
            ],
            shared_libs: [
                "libshim_crypto",
-                "libbase_shim",
                "android.hardware.security.rkp-V3-ndk",
                "libcrypto-tm",
                "liblog",
@@ -1439,7 +1415,6 @@ cc_prebuilt_library_shared {
            ],
            shared_libs: [
                "libshim_crypto",
-                "libbase_shim",
                "android.hardware.security.rkp-V3-ndk",
                "liblog",
                "libbase",
@@ -1525,6 +1500,31 @@ cc_prebuilt_library_shared {
    soc_specific: true,
 }

+cc_prebuilt_library_shared {
+    name: "libstork_shared",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libstork_shared.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
    name: "libswcnr",
    owner: "samsung",
@@ -1726,6 +1726,34 @@ cc_prebuilt_library_shared {
    soc_specific: true,
 }

+cc_prebuilt_library_shared {
+    name: "libvkservice",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libvkservice.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libstork_shared",
+                "libteecl",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
    name: "libwrappergps",
    owner: "samsung",
@@ -2047,7 +2075,6 @@ cc_prebuilt_library_shared {
            ],
            shared_libs: [
                "libshim_crypto",
-                "libbase_shim",
                "android.hardware.security.rkp-V3-ndk",
                "libbinder_ndk",
                "android.hardware.security.keymint-V4-ndk",
@@ -2276,23 +2303,52 @@ prebuilt_etc_xml {
 }

 prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.radio_manifest_2_34.xml",
+    name: "vendor.samsung.hardware.radio_manifest_2_33.xml",
    owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml",
    filename_from_src: true,
    sub_dir: "vintf/manifest",
    soc_specific: true,
 }

 prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.sehradio_manifest_2_34.xml",
+    name: "vendor.samsung.hardware.sehradio_manifest_2_33.xml",
    owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml",
    filename_from_src: true,
    sub_dir: "vintf/manifest",
    soc_specific: true,
 }

+cc_prebuilt_binary {
+    name: "cass",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/cass",
+            ],
+            shared_libs: [
+                "libengmode_client",
+                "libvkmanager_vendor",
+                "libsecril-client",
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
    name: "android.hardware.drm-service.widevine",
    owner: "samsung",
@@ -2533,6 +2589,61 @@ cc_prebuilt_binary {
    soc_specific: true,
 }

+cc_prebuilt_binary {
+    name: "vaultkeeperd",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/vaultkeeperd",
+            ],
+            shared_libs: [
+                "libdsms_vendor",
+                "libvkservice",
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_binary {
+    name: "vendor.samsung.hardware.security.proca@2.0-service",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service",
+            ],
+            shared_libs: [
+                "libteecl",
+                "liblog",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 install_symlink {
    name: "vendor_lib64_libOpenCL_so",
    soc_specific: true,
--- a/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin
+++ b/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin
--- a/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin
+++ b/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin
--- a/proprietary/vendor/bin/cass
+++ b/proprietary/vendor/bin/cass
--- a/proprietary/vendor/bin/hw/rild
+++ b/proprietary/vendor/bin/hw/rild
--- a/proprietary/vendor/bin/vaultkeeperd
+++ b/proprietary/vendor/bin/vaultkeeperd
--- a/proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service
+++ b/proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service
--- a/proprietary/vendor/etc/dolby/dax-default.xml
+++ b/proprietary/vendor/etc/dolby/dax-default.xml
@@ -1921,231 +1921,6 @@
    </data>
    <include preset="ieq_balanced" />
  </profile>
-  <profile id="9" name="LoudNorm">
-    <data>
-      <ieq-enable value="false" />
-      <ieq-amount value="6" />
-      <mi-dialog-enhancer-steering-enable value="false" />
-      <mi-dv-leveler-steering-enable value="true" />
-      <mi-ieq-steering-enable value="false" />
-      <mi-surround-compressor-steering-enable value="false" />
-      <mi-adaptive-virtualizer-steering-enable value="false" />
-      <volume-modeler-enable value="false" />
-      <reverb-suppression-enable value="false" />
-      <reverb-suppression-amount value="0" />
-      <endpoint_type id="speaker">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="16" />
-        <dialog-enhancer-ducking value="6" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="true" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-256" />
-        <volume-leveler-out-target value="-224" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-      <endpoint_type id="headphone">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="16" />
-        <dialog-enhancer-ducking value="6" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="true" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-256" />
-        <volume-leveler-out-target value="-224" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-      <endpoint_type id="bluetooth">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="16" />
-        <dialog-enhancer-ducking value="6" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="true" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-256" />
-        <volume-leveler-out-target value="-224" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-      <endpoint_type id="usb">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="16" />
-        <dialog-enhancer-ducking value="6" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="true" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-256" />
-        <volume-leveler-out-target value="-224" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-      <endpoint_type id="remote_submix">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="0" />
-        <dialog-enhancer-ducking value="0" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="false" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-320" />
-        <volume-leveler-out-target value="-320" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-      <endpoint_type id="aux_digital">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="0" />
-        <dialog-enhancer-ducking value="0" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="false" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-496" />
-        <volume-leveler-out-target value="-496" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-      <endpoint_type id="default">
-        <system-gain value ="0" />
-        <calibration-boost value="0" />
-        <dialog-enhancer-enable value="false" />
-        <dialog-enhancer-amount value="16" />
-        <dialog-enhancer-ducking value="6" />
-        <mi-virtualizer-binaural-steering-enable value="false" />
-        <peak-value value="256" />
-        <surround-decoder-enable value="true" />
-        <surround-boost value="0" />
-        <volmax-boost value="0" />
-        <volume-leveler-enable value="true" />
-        <volume-leveler-amount value="7" />
-        <volume-leveler-in-target value="-256" />
-        <volume-leveler-out-target value="-224" />
-        <graphic-equalizer-enable value="false" />
-        <virtualizer-enable value="false" />
-        <headtracking-enable value="false" />
-        <headphone-virtualizer-steerer-source-distance value="4"/>
-        <bass-mbdrc-enable value="false" />
-        <bass-enhancer-enable value="false" />
-        <virtual-bass-process-enable value="false" />
-        <headphone-virtualizer-mode value="2" />
-        <speaker-virtualizer-mode value="2" />
-        <advanced-speaker-virtualizer-start-bin value="6" />
-        <advanced-speaker-virtualizer-rendering-config value="103,32568,6698,5090,0,3,3,3" />
-        <advanced-headphone-virtualizer-rendering-config value="103,32568,11164,5090,0,3,3,3" />
-        <surround-decoder-diffuse-relocating-to-front-amount value="0" />
-        <advanced-headphone-virtualizer-lr-angle value="45" />
-      </endpoint_type>
-    </data>
-    <include preset="ieq_balanced" />
-  </profile>
  <tuning name="default" endpoint_type="other" mono_device="false" tuned_rate="48000" orientation="2" output_channels="2">
    <data>
      <height-filter-mode value="0" />
--- a/proprietary/vendor/etc/gnss/ca.pem
+++ b/proprietary/vendor/etc/gnss/ca.pem
@@ -1043,43 +1043,39 @@ BVHkmWyP+UtGpuge6HcRkKSH+yTMxxpwq4NlPfxYhjdN5+coIsKPI2nji7Fcrmej
 OynM3D4TIXBDamv5FHtKmCHI/vt1cRNEYApzaVCIdqzu01AO4mM=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIG0zCCBbugAwIBAgIQD+Q/uwE8P33Af8p8OpiPUjANBgkqhkiG9w0BAQsFADBZ
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypE
-aWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjUw
-MjE0MDAwMDAwWhcNMjYwMjEzMjM1OTU5WjBlMQswCQYDVQQGEwJVUzEOMAwGA1UE
-CBMFVGV4YXMxDzANBgNVBAcTBkRhbGxhczEcMBoGA1UECgwTQVQmVCBTZXJ2aWNl
-cywgSW5jLjEXMBUGA1UEAxMOc3VwbC5hdHRtZXgubXgwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQD8luUB2TUdsJF2vwsCk5kqDgDe8QvPtGDTewWFmzFX
-doo4fD1iyMQR2D8GF7aHdUt4XF/x2dJa8cpesigzvZMsXffZ32dEIi6fHcmYZRsT
-OyDR5CdawYgr/NL0RGaPaQvAH9v7rEiGycL1Rc3304Oq9FlTOGTliZSBdvPqpefW
-2j4GCp4ok/cvwxMXBKlrKoEgi3oSEkqYGbBzpV+FsUz28u3twKKBRvrDPj8eq+hl
-GDln9eWMzWkL9xRu8TaxHxzidmi24jw8ObzalKzf+b520C17VC1Vwtz6dlpWfkeR
-bIDG18rIKHnLxm705hXOnuJzds03V0VFpsqWT1vtZ3jdAgMBAAGjggOJMIIDhTAf
-BgNVHSMEGDAWgBR0hYDAZsffN97PvSk3qgMdvu3NFzAdBgNVHQ4EFgQUzSsIKfvC
-WF/OJiCKoxWmC7XqJ0owGQYDVR0RBBIwEIIOc3VwbC5hdHRtZXgubXgwPgYDVR0g
-BDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5kaWdpY2Vy
-dC5jb20vQ1BTMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0cDovL2NybDMuZGlnaWNl
-cnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3Js
-MEigRqBEhkJodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxH
-MlRMU1JTQVNIQTI1NjIwMjBDQTEtMS5jcmwwgYcGCCsGAQUFBwEBBHsweTAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFEGCCsGAQUFBzAChkVo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxHMlRMU1JT
-QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX0GCisGAQQB1nkC
-BAIEggFtBIIBaQFnAHYADleUvPOuqT4zGyyZB7P3kN+bwj1xMiXdIaklrGHFTiEA
-AAGVBcyxbgAABAMARzBFAiEAt7MkbrekgUC3Shm4t52QArLqdhCCNXXv75Xmxgkb
-ewgCIB06EqD0N4StKBN9WrPC5kqbi2an5OynHwBHRHKJh2KAAHYAZBHEbKQS7KeJ
-HKICLgC8q08oB9QeNSer6v7VA8l9zfAAAAGVBcyxrgAABAMARzBFAiEA/KMAkNNE
-tLLgN1OMsJryrbii1phX2jQnVRP6LmYM790CIH9HQK3qx8EAgP7LyHEN+33Jdj7X
-nn5U7JrC0Rf3Lq/+AHUASZybad4dfOz8Nt7Nh2SmuFuvCoeAGdFVUvvp6ynd+MMA
-AAGVBcyxwAAABAMARjBEAiBt5Onzyd/WMwmF+h6wf044Mj/F5oVVwJNg+TEocZ6e
-nQIgLr6JS633I9GpuIwqIQP4UJsPlpwq0ZUEXFOeqtMhxsswDQYJKoZIhvcNAQEL
-BQADggEBAHALVZoxK2Hvim/vX9qcOcGTiu9rF8R9QVR8v3hliZNqgql5jwDpg/71
-Q8vHOkvB6uK9WQ3LfIaqlSYBTK7bOEzbj+x08I4Q0zK5X8TH53FVzfmxM5O7vjqu
-uMfh4xk4vdba9vAAynfdcotPWLromKs4vFxcAauXJOwpZMujb2UvMhcZCk1AR8QN
-bQCcxQ997ZVAfhusgPY9epjwOs/0u0lpA2OVc3IvXAvv9YdKLs6zjfzKX2xKgwSE
-Q02v8iCHw7CHsBMrRDx+ZuDTzhgs96J+TLxB4DF37WyJFBzKYe7ZUn4IAwMtxUc+
-W4ubuhUDsCRzh17SG1eydGHX10AxVNU=
+MIIGKTCCBRGgAwIBAgIQDdbC5Ib+4Mjkp3+Z2EZl0TANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMjAwMjI0MDAwMDAwWhcN
+MjEwMjI0MTIwMDAwWjB3MQswCQYDVQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDzAN
+BgNVBAcTBkRhbGxhczEcMBoGA1UECgwTQVQmVCBTZXJ2aWNlcywgSW5jLjEQMA4G
+A1UECxMHRGF0YVZhczEXMBUGA1UEAxMOc3VwbC5hdHRtZXgubXgwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS3YvxxP3I11tzdGU+S+q+JMGdHLU5CAZy
+PFKyZxoNnQ86DR3ZiOCzy9BGVYnZ7I7mJwJOgE/w7rPFDSrbo9nJfYp/DMTp3AEL
+u1qfCU/yBgW2qDEVvzcu/MZLYSIUNspszMdTGI9vNlONpjls1eZmPCH2Le0ySdS6
+2pb23R+5ZPYNP01fLYGds51B3cKnbaqh2nycgTqbwvNsbjn39ymljao5fVsK7pXD
+/9yQWRsn2PPg3bgrHaoBzJRx0hNSmS9mHZXrKkVFBUDcYb+MOXjN45rZQb2ACM3b
+6Ytfh5usD1vflNCeVWcyjXa2O/Q8e0W3S+IMQKDku9Iv8FHjYS+LAgMBAAGjggLZ
+MIIC1TAfBgNVHSMEGDAWgBQPgGEcgjFh1S8o541GOLQs4cbZ4jAdBgNVHQ4EFgQU
+nf1iY341mmWs52uYpvNJmSnO5sMwGQYDVR0RBBIwEIIOc3VwbC5hdHRtZXgubXgw
+DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBr
+BgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1z
+aGEyLWc2LmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Et
+c2hhMi1nNi5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcC
+ARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwfAYIKwYB
+BQUHAQEEcDBuMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20w
+RgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2Vy
+dFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQwCQYDVR0TBAIwADCCAQMGCisGAQQB1nkC
+BAIEgfQEgfEA7wB2ALvZ37wfinG1k5Qjl6qSe0c4V5UKq1LoGpCWZDaOHtGFAAAB
+cHh0Yc8AAAQDAEcwRQIgC2Q0Ltek+hWGNQgf1QS4q11x2B7FC5k1q47cHfuHjJkC
+IQDaO4C0IEVrHtCpvvz40wPC+HN3KNI/xTrY+arPud7WcgB1AFzcQ5L+5qtFRLFe
+mtRW5hA3+9X6R9yhc5SyXub2xw7KAAABcHh0YgUAAAQDAEYwRAIgdSw0HFbA8HlR
+uSEkDU6O0Za9i6IH6EzpfqMrMzGcEzACIH6cJjVfBngPjyBElwL2JMHcNbDVrU14
+xk2FLI6xBrnGMA0GCSqGSIb3DQEBCwUAA4IBAQBGUGTwgaFyftfduw9xpTWeNQaY
+X6IdAOEshh5xD4qWdkjn23NCBHToadQoYHcWaZPE/RycyqwyyyxvOAGXnHz021/u
+MijeqXw4iFzSS/pQ8WeY5Er0NoXWxizOqVTJzT2yeTfHZCHA/OuVcPppyeWlZ3J4
+loERcNcUSGoe3/mCPcINIoc+AGbn3mcekVTpEv4gNz1fj8RXlxakWp+2B4PDZxv9
+KmHZH4RMtx9Yqmd2NZOXZVMo19MQf927VcIPrZGKVBREgZ/0TPWCMQPHGWAcMnWp
+RWLyn6OOTONhQJcywhM1Jk3YjZ+VEsbJm8uaTafFtCQhCfZfyOTaEalc4jCr
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
--- a/proprietary/vendor/etc/init/cass.rc
+++ b/proprietary/vendor/etc/init/cass.rc
@@ -0,0 +1,9 @@
+service cass /vendor/bin/cass
+    class core
+    user system
+    group radio wakelock system
+    capabilities BLOCK_SUSPEND
+    disabled
+
+on post-fs-data
+    start cass
--- a/proprietary/vendor/etc/init/pa_daemon_teegris.rc
+++ b/proprietary/vendor/etc/init/pa_daemon_teegris.rc
@@ -0,0 +1,13 @@
+# Process Authenticator startup
+service proca /vendor/bin/vendor.samsung.hardware.security.proca@2.0-service
+    class early_hal
+    user system
+    group system
+    disabled
+
+on property:vendor.tzdaemon=Ready
+    start proca
+
+on late-fs && property:vendor.tzdaemon=Ready
+    start proca
+
--- a/proprietary/vendor/etc/init/vaultkeeper_common.rc
+++ b/proprietary/vendor/etc/init/vaultkeeper_common.rc
@@ -0,0 +1,18 @@
+# VaultKeeper
+service vaultkeeper /vendor/bin/vaultkeeperd
+    class core
+    user system
+    group system
+    disabled
+
+service vaultkeeper_hal /vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service
+    class early_hal
+    user system
+    group system
+    disabled
+
+on late-fs
+    # vaultkeeper
+    mkdir /dev/socket/vaultkeeper 0770 system system
+    start vaultkeeper
+    start vaultkeeper_hal
--- a/proprietary/vendor/etc/plmn_delta_chn.bin
+++ b/proprietary/vendor/etc/plmn_delta_chn.bin
@@ -45,8 +45,6 @@
 45420PCCW-HKT"PCCW-HKT

 45429PCCW_HKT"PCCW_HKT
-!
-454383China Mobile HK"CMHK

 45500SmarTone"SmarTone

--- a/proprietary/vendor/etc/plmn_delta_hktw.bin
+++ b/proprietary/vendor/etc/plmn_delta_hktw.bin
@@ -31,8 +31,6 @@
 45419PCCW-HKT"PCCW-HKT

 45420PCCW-HKT"PCCW-HKT
-!
-454383China Mobile HK"CMHK

 45500SmarTone"SmarTone

--- a/proprietary/vendor/etc/plmn_se13_prebuilt.bin
+++ b/proprietary/vendor/etc/plmn_se13_prebuilt.bin
@@ -112,10 +112,6 @@ TELEKOM.RO"TELEKOM
 22801Swisscom"Swisscom

 22802Sunrise"Sunrise
-
-22803Salt"Salt
-
-22872SolNet"SolNet

 22803Salt"Salt

@@ -235,8 +231,6 @@ Telenor SE"TelenorS
 24802Elisa EE"ELISA

 24803Tele2 EE"Tele2 EE
-
-25001MTS RUS"MTS RUS

 25001MTS RUS"MTS RUS

@@ -274,8 +268,8 @@ Beeline UA"Beeline
 26001Plus"PLUS

 26002T-Mobile.pl"TM PL
-
-26003	Orange PL"Orange
+
+26003	Orange PL"Orange

 26006Play"Play
 +
@@ -284,15 +278,19 @@ Beeline UA"Beeline
 26202vodafone.de"Vodafone

 26203o2 - de"o2 - de
+
+26207o2 - de"o2 - de

 262231&1"1&1

+2620231&1"1&1
+
 26601GIBTEL"GIBTEL

 26603GIBFIBRE"GIBFIBRE
-
-26801

+26801
+vodafone P"voda P

 26806MEO"MEO

@@ -336,8 +334,8 @@ IS OnWaves"OnWaves

 28001Cyta"Cyta

-28010epic"epic
-!
+28010epic"epic
+!
 28020PrimeTel PLC"PrimeTel

 28022Cablenet"Cablenet
@@ -485,8 +483,6 @@ SPM AMERIS"AMERIS
 310320USA - CellularOne"Cell
 #
 310340Limitless Mobile"LMUSA
- 
-310370DOCOMO PACIFIC"DPAC
 
 310370DOCOMO PACIFIC"DPAC

@@ -605,8 +601,6 @@ NetGenuity"NetGenui
 314710Ringer"RNGR
 
 314730TextNow USA"TextNow
-
-330110PR Claro"Claro

 330110PR Claro"Claro

@@ -1105,6 +1099,8 @@ $
 45412China Mobile HK"CMHK
 
 45413China Mobile HK"CMHK
+
+45415SmarTone HK"SMC HK

 45416CSL"CSL

@@ -1123,12 +1119,12 @@ $
 45502CT Macau"CT Macau

 455033 Macau"3 Macau
-
-45504CTM"CTM
+
+45504CTM"CTM

 455053 Macau"3 Macau
-
-45507CT Macau"CT Macau
+
+45507CT Macau"CT Macau

 45601Cellcard"Cellcard

@@ -1149,8 +1145,6 @@ CHN-UNICOM"UNICOM

 46002CHINA MOBILE"CMCC

-46003CHN-CT"CT
-
 46003CHN-CT"CT

 46004CHINA MOBILE"CMCC
@@ -1194,15 +1188,11 @@ Banglalink"BL
 470001Grameenphone"Grameen

 47002robi axiata"robi
-
-47003
-Banglalink"BL
+
 47003
 Banglalink"BL
-
-47201DHIRAAGU"DHIRAAGU
-,
-47202Ooredoo Maldives PVT LTD"Ooredoo
+
+47004BGD bMobile"bMobile

 47201DHIRAAGU"DHIRAAGU
 ,
@@ -1350,8 +1340,6 @@ CK KOKANET"KOKANET
 
 55001FSM Telecom"FSM Tele

- 
-55001FSM Telecom"FSM Tele
 55201PalauCel"PalauCel

 55299PLW PMCI"PMCI
@@ -1369,8 +1357,6 @@ OOREDOO TN"OOREDOO
 60301ALG Mobilis"Mobilis

 60400	Orange MA"Orange
-60302DJEZZY"DJEZZY
-

 60401MOR IAM"IAM

@@ -1411,14 +1397,8 @@ AirtelTigo"ATL-TIGO
 61807
 Orange LBR"Orange L

-61807
-Orange LBR"Orange L
-
-61905Africell"Africell
 61905Africell"Africell

-
-62003
 61907QCell"QC

 62003
@@ -1462,19 +1442,14 @@ SO Telesom"Tele
 MTN RWANDA"MTN

 63513AirtelRW"AirtelRW
-MTN RWANDA"MTN
-
-63513AirtelRW"AirtelRW
-"
+"
+63601
 ethio telecom"ethiotel

 63701
 SO Telesom"Tele

 63730	Som Golis"Golis
-63730	Som Golis"Golis
-#
-63750Hormuud Telecom"Hormuud
 #
 63750Hormuud Telecom"Hormuud

@@ -1565,10 +1540,6 @@ TelkomSA-R"Telkom-R

 71021	CLARO NIC"ClaroNIC

-
-71021	CLARO NIC"ClaroNIC
-
-710300Tigo"Tigo
 710300Tigo"Tigo

 71201I.C.E."I.C.E.
@@ -1622,8 +1593,8 @@ TelkomSA-R"Telkom-R

 73002Movistar"Movistar

-
-73002Movistar"Movistar
+73007Movistar"Movistar
+
 73010	ENTEL PCS"ENTEL

 732101Claro"Claro
@@ -1655,6 +1626,8 @@ TelkomSA-R"Telkom-R
 74404TIGO PY"TIGO
 
 74405PY Personal"Personal
+
+74602TELESUR"TELESUR

 74603DIGICEL"DIGICEL

@@ -1676,4 +1649,4 @@ AeroMobile"AeroMob

 90115OnAir"OnAir
 "
-90114
+90119
--- a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
@@ -7,16 +7,19 @@
        <name>android.hardware.radio</name>
        <transport>hwbinder</transport>
    </hal>
+    <hal override="true" format="hidl">
+        <name>android.hardware.radio</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.2::ISap/slot1</fqname>
+        <fqname>@1.2::ISap/slot2</fqname>
+    </hal>
    <hal override="true" format="hidl">
        <name>android.hardware.radio.config</name>
        <transport>hwbinder</transport>
    </hal>
-    <hal override="true" format="aidl">
-        <name>android.hardware.radio.ims</name>
-    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.modem</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioModem</name>
            <instance>slot1</instance>
@@ -25,7 +28,7 @@
    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.network</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioNetwork</name>
            <instance>slot1</instance>
@@ -34,7 +37,7 @@
    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.voice</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioVoice</name>
            <instance>slot1</instance>
@@ -43,7 +46,7 @@
    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.config</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioConfig</name>
            <instance>default</instance>
@@ -51,7 +54,7 @@
    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.sim</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioSim</name>
            <instance>slot1</instance>
@@ -60,7 +63,7 @@
    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.data</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioData</name>
            <instance>slot1</instance>
@@ -69,20 +72,11 @@
    </hal>
    <hal override="true" format="aidl">
        <name>android.hardware.radio.messaging</name>
-        <version>2</version>
+        <version>1</version>
        <interface>
            <name>IRadioMessaging</name>
            <instance>slot1</instance>
            <instance>slot2</instance>
        </interface>
    </hal>
-    <hal override="true" format="aidl">
-        <name>android.hardware.radio.sap</name>
-        <version>1</version>
-        <interface>
-            <name>ISap</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-    </hal>
 </manifest>
--- a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml
--- a/proprietary/vendor/firmware/wifi/mx140.bin
+++ b/proprietary/vendor/firmware/wifi/mx140.bin
--- a/proprietary/vendor/firmware/wifi/mx140_t.bin
+++ b/proprietary/vendor/firmware/wifi/mx140_t.bin
--- a/proprietary/vendor/firmware/wifi/mx140_t_common.hcf
+++ b/proprietary/vendor/firmware/wifi/mx140_t_common.hcf
--- a/proprietary/vendor/lib64/libVendorSemDataProps.so
+++ b/proprietary/vendor/lib64/libVendorSemDataProps.so
--- a/proprietary/vendor/lib64/libVendorSemTelephonyProps.so
+++ b/proprietary/vendor/lib64/libVendorSemTelephonyProps.so
--- a/proprietary/vendor/lib64/libengmode_client.so
+++ b/proprietary/vendor/lib64/libengmode_client.so
--- a/proprietary/vendor/lib64/libfloatingfeature.so
+++ b/proprietary/vendor/lib64/libfloatingfeature.so
--- a/proprietary/vendor/lib64/libprofileparamstorage.so
+++ b/proprietary/vendor/lib64/libprofileparamstorage.so
--- a/proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so
+++ b/proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so
--- a/proprietary/vendor/lib64/libril_sem.so
+++ b/proprietary/vendor/lib64/libril_sem.so
--- a/proprietary/vendor/lib64/libsec-ril.so
+++ b/proprietary/vendor/lib64/libsec-ril.so
--- a/proprietary/vendor/lib64/libsecnativefeature.so
+++ b/proprietary/vendor/lib64/libsecnativefeature.so
--- a/proprietary/vendor/lib64/libsecril-client.so
+++ b/proprietary/vendor/lib64/libsecril-client.so
--- a/proprietary/vendor/lib64/libsemnativecarrierfeature.so
+++ b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
--- a/proprietary/vendor/lib64/libskeymint10device.so
+++ b/proprietary/vendor/lib64/libskeymint10device.so
--- a/proprietary/vendor/lib64/libskeymint_cli.so
+++ b/proprietary/vendor/lib64/libskeymint_cli.so
--- a/proprietary/vendor/lib64/libspatializerparamstorage.so
+++ b/proprietary/vendor/lib64/libspatializerparamstorage.so
--- a/proprietary/vendor/lib64/libstork_shared.so
+++ b/proprietary/vendor/lib64/libstork_shared.so
--- a/proprietary/vendor/lib64/libvkmanager_vendor.so
+++ b/proprietary/vendor/lib64/libvkmanager_vendor.so
--- a/proprietary/vendor/lib64/libvkservice.so
+++ b/proprietary/vendor/lib64/libvkservice.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.keymint-V1-ndk_platform.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.keymint-V1-ndk_platform.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -6,15 +6,20 @@ PRODUCT_SOONG_NAMESPACES += \
    vendor/samsung/s5e8825-common

 PRODUCT_COPY_FILES += \
+    vendor/samsung/s5e8825-common/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/00060308060501020000000000000000.tabin \
+    vendor/samsung/s5e8825-common/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/0706000000000000000000000000004d.tlbin \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/ca.pem:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/ca.pem \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm-service.widevine.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint-service.samsung.rc \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/cass.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cass.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/init.nfc.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.nfc.samsung.rc \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/pa_daemon_teegris.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pa_daemon_teegris.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/secaudiohalaidl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/secaudiohalaidl.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/teegris_v4.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/teegris_v4.rc \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vaultkeeper_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vaultkeeper_common.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vendor.samsung.rild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.rild.rc \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/wifi_slsi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi_slsi.rc \
@@ -32,6 +37,9 @@ PRODUCT_COPY_FILES += \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/sec_audio_volume_curve.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sec_audio_volume_curve.xml \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
    vendor/samsung/s5e8825-common/proprietary/vendor/etc/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/wifi/mx140.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/mx140.bin \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/wifi/mx140_t.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/mx140_t.bin \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/wifi/mx140_t_common.hcf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/mx140_t_common.hcf \
    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/APSV_AUDIO_SLSI.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/APSV_AUDIO_SLSI.bin \
    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/OD_V2.1.6_01_26_QVGA.nnc:$(TARGET_COPY_OUT_VENDOR)/firmware/OD_V2.1.6_01_26_QVGA.nnc \
    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/OD_V2.3.7_02_05_VGA.nnc:$(TARGET_COPY_OUT_VENDOR)/firmware/OD_V2.3.7_02_05_VGA.nnc \
@@ -42,10 +50,7 @@ PRODUCT_COPY_FILES += \
    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/dolby.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dolby.bin \
    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/listenbackeffect.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/listenbackeffect.bin \
    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/secure_configuration.flm.cfg.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/secure_configuration.flm.cfg.bin \
-    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/volumemonitor.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/volumemonitor.bin \
-    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/wifi/mx140.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/mx140.bin \
-    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/wifi/mx140_t.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/mx140_t.bin \
-    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/wifi/mx140_t_common.hcf:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi/mx140_t_common.hcf
+    vendor/samsung/s5e8825-common/proprietary/vendor/firmware/volumemonitor.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/volumemonitor.bin

 PRODUCT_PACKAGES += \
    libGLES_mali \
@@ -82,7 +87,6 @@ PRODUCT_PACKAGES += \
    liblastaboxmsg \
    liboemcrypto \
    libprofileparamstorage \
-    libprotobuf-cpp-full-21.7 \
    libqfp_sensortest \
    librecordalive \
    libril_sem \
@@ -99,6 +103,7 @@ PRODUCT_PACKAGES += \
    libskeymint_cli \
    libspatializerparamstorage \
    libspeakercalibration \
+    libstork_shared \
    libswcnr \
    libsynaFpSensorTestNwd \
    libteecl \
@@ -107,6 +112,7 @@ PRODUCT_PACKAGES += \
    libuniplugin \
    libuuid_vendor \
    libvkmanager_vendor \
+    libvkservice \
    libwrappergps \
    libwvaidl \
    sensors.grip \
@@ -128,8 +134,9 @@ PRODUCT_PACKAGES += \
    manifest_android.hardware.drm-service.widevine.xml \
    secaudiohalaidl_manifest.xml \
    vendor.samsung.hardware.radio.exclude.slsi.xml \
-    vendor.samsung.hardware.radio_manifest_2_34.xml \
-    vendor.samsung.hardware.sehradio_manifest_2_34.xml \
+    vendor.samsung.hardware.radio_manifest_2_33.xml \
+    vendor.samsung.hardware.sehradio_manifest_2_33.xml \
+    cass \
    android.hardware.drm-service.widevine \
    android.hardware.security.keymint-service.samsung \
    gps \
@@ -138,7 +145,9 @@ PRODUCT_PACKAGES += \
    secaudiohalaidl \
    vendor.samsung.hardware.gnss@2.1-service \
    tzdaemon \
-    tzts_daemon
+    tzts_daemon \
+    vaultkeeperd \
+    vendor.samsung.hardware.security.proca@2.0-service

 PRODUCT_PACKAGES += \
    vendor_lib64_libOpenCL_so \