Merge "Set up IRadioConfig 1.3"
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index be86d7f..51887e5 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -273,17 +273,6 @@
</interface>
-->
</hal>
- <!-- TODO (b/130076972):
- <hal format="hidl">
- <name>android.hardware.radio.config</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IRadioConfig</name>
- <instance>default</instance>
- </interface>
- </hal>
- -->
<!-- TODO (b/130079239):
<hal format="hidl">
<name>android.hardware.secure_element</name>
diff --git a/shared/device.mk b/shared/device.mk
index 6975050..3f570b4 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -268,6 +268,10 @@
PRODUCT_PACKAGES += \
android.hardware.input.classifier@1.0-service.default
+# Radio Config HAL
+PRODUCT_PACKAGES += \
+ android.hardware.radio.config@1.3-service
+
#
# Sensors
#
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index a74ee48..fd3305e 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -72,6 +72,7 @@
/vendor/bin/hw/android\.hardware\.input\.classifier@1\.0-service.default u:object_r:hal_input_classifier_default_exec:s0
/vendor/bin/hw/android\.hardware\.thermal@2\.0-service\.mock u:object_r:hal_thermal_default_exec:s0
/vendor/bin/hw/android\.hardware\.authsecret@1\.0-service u:object_r:hal_authsecret_default_exec:s0
+/vendor/bin/hw/android\.hardware\.radio\.config@1\.3-service u:object_r:hal_radio_config_default_exec:s0
/vendor/bin/init\.insmod\.sh u:object_r:init_insmod_sh_exec:s0
/vendor/lib(64)?/cuttlefish_auto_resources.so u:object_r:same_process_hal_file:s0