diff --git a/Android.bp b/Android.bp
index 8d8a5d9..df99698 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1485,14 +1485,14 @@ cc_prebuilt_library_shared {
}
cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.radio.bridge@2.0",
+ name: "vendor.samsung.hardware.radio-V1-ndk",
owner: "samsung",
strip: {
none: true,
},
target: {
android_arm64: {
- srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so"],
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so"],
},
},
compile_multilib: "64",
@@ -1502,14 +1502,14 @@ cc_prebuilt_library_shared {
}
cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.radio.bridge@2.1",
+ name: "vendor.samsung.hardware.radio.bridge-V1-ndk",
owner: "samsung",
strip: {
none: true,
},
target: {
android_arm64: {
- srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so"],
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so"],
},
},
compile_multilib: "64",
@@ -1519,14 +1519,65 @@ cc_prebuilt_library_shared {
}
cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.radio.channel@2.0",
+ name: "vendor.samsung.hardware.radio.channel-V1-ndk",
owner: "samsung",
strip: {
none: true,
},
target: {
android_arm64: {
- srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so"],
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "vendor.samsung.hardware.radio.data-V1-ndk",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "vendor.samsung.hardware.radio.messaging-V1-ndk",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "vendor.samsung.hardware.radio.sim-V1-ndk",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so"],
},
},
compile_multilib: "64",
@@ -1602,6 +1653,33 @@ prebuilt_etc_xml {
soc_specific: true,
}
+prebuilt_etc_xml {
+ name: "vendor.samsung.hardware.radio.exclude.slsi.xml",
+ owner: "samsung",
+ src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml",
+ filename_from_src: true,
+ sub_dir: "vintf/manifest",
+ soc_specific: true,
+}
+
+prebuilt_etc_xml {
+ name: "vendor.samsung.hardware.radio_manifest_2_33.xml",
+ owner: "samsung",
+ 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_33.xml",
+ owner: "samsung",
+ 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",
diff --git a/proprietary/vendor/bin/hw/rild b/proprietary/vendor/bin/hw/rild
old mode 100755
new mode 100644
index 0b23ee8..252153d
Binary files a/proprietary/vendor/bin/hw/rild and b/proprietary/vendor/bin/hw/rild differ
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml
new file mode 100644
index 0000000..1d78efe
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml
@@ -0,0 +1,6 @@
+
+
+ vendor.samsung_slsi.hardware.radio
+ hwbinder
+
+
diff --git 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
new file mode 100644
index 0000000..a2a9509
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
@@ -0,0 +1,82 @@
+
+
+ android.hardware.radio.deprecated
+ hwbinder
+
+
+ android.hardware.radio
+ hwbinder
+
+
+ android.hardware.radio
+ hwbinder
+ @1.2::ISap/slot1
+ @1.2::ISap/slot2
+
+
+ android.hardware.radio.config
+ hwbinder
+
+
+ android.hardware.radio.modem
+ 1
+
+ IRadioModem
+ slot1
+ slot2
+
+
+
+ android.hardware.radio.network
+ 1
+
+ IRadioNetwork
+ slot1
+ slot2
+
+
+
+ android.hardware.radio.voice
+ 1
+
+ IRadioVoice
+ slot1
+ slot2
+
+
+
+ android.hardware.radio.config
+ 1
+
+ IRadioConfig
+ default
+
+
+
+ android.hardware.radio.sim
+ 1
+
+ IRadioSim
+ slot1
+ slot2
+
+
+
+ android.hardware.radio.data
+ 1
+
+ IRadioData
+ slot1
+ slot2
+
+
+
+ android.hardware.radio.messaging
+ 1
+
+ IRadioMessaging
+ slot1
+ slot2
+
+
+
diff --git 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
new file mode 100644
index 0000000..956fe6b
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml
@@ -0,0 +1,58 @@
+
+
+ vendor.samsung.hardware.radio.network
+ 1
+
+ ISehRadioNetwork
+ slot1
+ slot2
+
+
+
+ vendor.samsung.hardware.radio.channel
+ 1
+
+ ISehRadioChannel
+ imsd
+ imsd2
+ epdgd
+ epdgd2
+
+
+
+ vendor.samsung.hardware.radio.bridge
+ 1
+
+ ISehRadioBridge
+ slot1
+ slot2
+
+
+
+ vendor.samsung.hardware.radio.data
+ 1
+
+ ISehRadioData
+ slot1
+ slot2
+
+
+
+ vendor.samsung.hardware.radio.sim
+ 1
+
+ ISehRadioSim
+ slot1
+ slot2
+
+
+
+ vendor.samsung.hardware.radio.messaging
+ 1
+
+ ISehRadioMessaging
+ slot1
+ slot2
+
+
+
diff --git a/proprietary/vendor/lib/libsecril-client.so b/proprietary/vendor/lib/libsecril-client.so
index d5db961..6d9a14e 100644
Binary files a/proprietary/vendor/lib/libsecril-client.so and b/proprietary/vendor/lib/libsecril-client.so differ
diff --git a/proprietary/vendor/lib/libsemnativecarrierfeature.so b/proprietary/vendor/lib/libsemnativecarrierfeature.so
index da4d536..baeb655 100644
Binary files a/proprietary/vendor/lib/libsemnativecarrierfeature.so and b/proprietary/vendor/lib/libsemnativecarrierfeature.so differ
diff --git a/proprietary/vendor/lib64/libSemDataProps.so b/proprietary/vendor/lib64/libSemDataProps.so
index 87d9c49..2055cf6 100644
Binary files a/proprietary/vendor/lib64/libSemDataProps.so and b/proprietary/vendor/lib64/libSemDataProps.so differ
diff --git a/proprietary/vendor/lib64/libSemTelephonyProps.so b/proprietary/vendor/lib64/libSemTelephonyProps.so
index 05f8c91..8a92efd 100644
Binary files a/proprietary/vendor/lib64/libSemTelephonyProps.so and b/proprietary/vendor/lib64/libSemTelephonyProps.so differ
diff --git a/proprietary/vendor/lib64/libril_sem.so b/proprietary/vendor/lib64/libril_sem.so
index ed80b14..897bc10 100644
Binary files a/proprietary/vendor/lib64/libril_sem.so and b/proprietary/vendor/lib64/libril_sem.so differ
diff --git a/proprietary/vendor/lib64/libsec-ril.so b/proprietary/vendor/lib64/libsec-ril.so
index 22cec45..69743af 100644
Binary files a/proprietary/vendor/lib64/libsec-ril.so and b/proprietary/vendor/lib64/libsec-ril.so differ
diff --git a/proprietary/vendor/lib64/libsecril-client.so b/proprietary/vendor/lib64/libsecril-client.so
index 411028f..6b3101b 100644
Binary files a/proprietary/vendor/lib64/libsecril-client.so and b/proprietary/vendor/lib64/libsecril-client.so differ
diff --git a/proprietary/vendor/lib64/libsemnativecarrierfeature.so b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
index af2b562..29483f3 100644
Binary files a/proprietary/vendor/lib64/libsemnativecarrierfeature.so and b/proprietary/vendor/lib64/libsemnativecarrierfeature.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so
new file mode 100644
index 0000000..d583674
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so
new file mode 100644
index 0000000..c9d9313
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
deleted file mode 100644
index 7533c09..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
deleted file mode 100644
index 8c9e39e..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so
new file mode 100644
index 0000000..f3d5cf3
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
deleted file mode 100644
index 1385e12..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so
new file mode 100644
index 0000000..baca0c2
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so
new file mode 100644
index 0000000..d8cb7d9
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
new file mode 100644
index 0000000..acdcb67
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so differ
diff --git a/universal9830-common-vendor.mk b/universal9830-common-vendor.mk
index 64e9065..c70d8f1 100644
--- a/universal9830-common-vendor.mk
+++ b/universal9830-common-vendor.mk
@@ -191,14 +191,20 @@ PRODUCT_PACKAGES += \
sensors.grip \
vendor.samsung.hardware.gnss@2.0 \
vendor.samsung.hardware.gnss@2.1 \
- vendor.samsung.hardware.radio.bridge@2.0 \
- vendor.samsung.hardware.radio.bridge@2.1 \
- vendor.samsung.hardware.radio.channel@2.0 \
+ vendor.samsung.hardware.radio-V1-ndk \
+ vendor.samsung.hardware.radio.bridge-V1-ndk \
+ vendor.samsung.hardware.radio.channel-V1-ndk \
+ vendor.samsung.hardware.radio.data-V1-ndk \
+ vendor.samsung.hardware.radio.messaging-V1-ndk \
+ vendor.samsung.hardware.radio.sim-V1-ndk \
vendor.samsung.hardware.thermal@1.0 \
vendor.samsung_slsi.hardware.eden_runtime@1.0-impl \
vendor.samsung_slsi.hardware.eden_runtime@1.0 \
com.android.hotwordenrollment.common.util \
manifest_android.hardware.drm@1.3-service.widevine.xml \
+ vendor.samsung.hardware.radio.exclude.slsi.xml \
+ vendor.samsung.hardware.radio_manifest_2_33.xml \
+ vendor.samsung.hardware.sehradio_manifest_2_33.xml \
cass \
cbd \
android.hardware.drm@1.3-service.widevine \