commit 1d782bd6a20eb8e0bd9836e92d264c9ae03096f2
author Aaron Tsai <tsaiaaron@google.com> Thu Apr 21 13:42:44 2022 +0000
committer Aaron Tsai <tsaiaaron@google.com> Thu May 19 05:03:19 2022 +0000
tree c24c3bf5b6ff485231c60ff1e2b5cc9423ab327e
parent 345b35180d823bfb256f87cb22bfc59a46442511

Support IRadioNetwork V2

Bug: 227110409
Bug: 232704878
Test: build pass
Change-Id: I703715db367ac660ef8c326b5171275a08ae06aa

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 1ff40b9..14b943b 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -568,7 +568,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.radio.network</name>
-        <version>1</version>
+        <version>1-2</version>
         <interface>
             <name>IRadioNetwork</name>
             <instance>slot1</instance>

radio/aidl/Android.bp

diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp
index ab4309e..efbd8c8 100644
--- a/radio/aidl/Android.bp
+++ b/radio/aidl/Android.bp
@@ -155,6 +155,7 @@
     name: "android.hardware.radio.network",
     vendor_available: true,
     host_supported: true,
+    vndk_use_version: "2",
     srcs: ["android/hardware/radio/network/*.aidl"],
     stability: "vintf",
     imports: ["android.hardware.radio-V1"],