From 694a1134c21f4e03019c50192536bbff7ac62f31 Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Sun, 5 Dec 2021 05:07:40 +0530
Subject: [PATCH] Add device manifest for radio & keymint

Change-Id: Ib6c4b28d33fb64cb05c715d86a96a829a498beac
---
 BoardConfigLineage.mk                         |  5 ++
 ....hardware.security.rkp-service.citadel.xml |  7 +++
 manifest_radio_ds.xml                         | 58 +++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 android.hardware.security.rkp-service.citadel.xml
 create mode 100644 manifest_radio_ds.xml

diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index 827ed34..eba8d75 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -4,6 +4,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# Manifests
+DEVICE_MANIFEST_FILE += \
+    device/google/zumapro/android.hardware.security.rkp-service.citadel.xml \
+    device/google/zumapro/manifest_radio_ds.xml
+
 # Partitions
 AB_OTA_PARTITIONS += \
     vendor \
diff --git a/android.hardware.security.rkp-service.citadel.xml b/android.hardware.security.rkp-service.citadel.xml
new file mode 100644
index 0000000..035dfe0
--- /dev/null
+++ b/android.hardware.security.rkp-service.citadel.xml
@@ -0,0 +1,7 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>android.hardware.security.keymint</name>
+        <version>3</version>
+        <fqname>IRemotelyProvisionedComponent/strongbox</fqname>
+    </hal>
+</manifest>
diff --git a/manifest_radio_ds.xml b/manifest_radio_ds.xml
new file mode 100644
index 0000000..2101b21
--- /dev/null
+++ b/manifest_radio_ds.xml
@@ -0,0 +1,58 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>android.hardware.radio.config</name>
+        <version>2</version>
+        <fqname>IRadioConfig/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.data</name>
+        <version>2</version>
+        <fqname>IRadioData/slot1</fqname>
+        <fqname>IRadioData/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.messaging</name>
+        <version>2</version>
+        <fqname>IRadioMessaging/slot1</fqname>
+        <fqname>IRadioMessaging/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.modem</name>
+        <version>2</version>
+        <fqname>IRadioModem/slot1</fqname>
+        <fqname>IRadioModem/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.network</name>
+        <version>2</version>
+        <fqname>IRadioNetwork/slot1</fqname>
+        <fqname>IRadioNetwork/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.sap</name>
+        <fqname>ISap/slot1</fqname>
+        <fqname>ISap/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.sim</name>
+        <version>2</version>
+        <fqname>IRadioSim/slot1</fqname>
+        <fqname>IRadioSim/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.voice</name>
+        <version>2</version>
+        <fqname>IRadioVoice/slot1</fqname>
+        <fqname>IRadioVoice/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.secure_element</name>
+        <fqname>ISecureElement/SIM1</fqname>
+        <fqname>ISecureElement/SIM2</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.1::IOemSlsiRadioExternal/rilExternal</fqname>
+    </hal>
+</manifest>