commit b423fafc36dfb1fe5dce8705a4dab12ad66bf537
author Helen <helenhykim@google.com> Wed Oct 26 08:54:04 2022 +0000
committer Helen <helenhykim@google.com> Wed Oct 26 08:55:20 2022 +0000
tree bfd58575f921c1348371d5fcbc3b80769508e895
parent 7093d8d44bfafeb40fb741e497e53ec0c229b095
parent 0fef85d6e2fd097b75cf7142319b1ae70ef6ee82

[AOSP Ims] Merge Ims and ImsMedia HAL from 'main-ims-dev' to 'master' branch

Bug: 250912118, 251319296
Test: atest VtsHalRadioTargetTest

Change-Id: Idad3b444f57c3964549bd64222967fed954219cd

radio/aidl/Android.bp

diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp
index 613f31b..8911aea 100644
--- a/radio/aidl/Android.bp
+++ b/radio/aidl/Android.bp
@@ -203,3 +203,37 @@
     ],
 
 }
+
+aidl_interface {
+    name: "android.hardware.radio.ims.media",
+    vendor_available: true,
+    srcs: ["android/hardware/radio/ims/media/*.aidl"],
+    stability: "vintf",
+    imports: ["android.hardware.radio-V1",
+              "android.hardware.radio.data-V1"],
+    backend: {
+        cpp: {
+            enabled: false,
+        },
+        java: {
+            sdk_version: "module_current",
+        },
+    },
+}
+
+aidl_interface {
+    name: "android.hardware.radio.ims",
+    vendor_available: true,
+    srcs: ["android/hardware/radio/ims/*.aidl"],
+    stability: "vintf",
+    imports: ["android.hardware.radio-V1"],
+    backend: {
+        cpp: {
+            enabled: false,
+        },
+        java: {
+            sdk_version: "module_current",
+        },
+    },
+}
+