diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml index 314757f477..4ac95f58f4 100644 --- a/compatibility_matrices/compatibility_matrix.8.xml +++ b/compatibility_matrices/compatibility_matrix.8.xml @@ -491,16 +491,6 @@ slot3 - - android.hardware.radio.satellite - 1 - - IRadioSatellite - slot1 - slot2 - slot3 - - android.hardware.radio.ims.media 1 diff --git a/compatibility_matrices/compatibility_matrix.9.xml b/compatibility_matrices/compatibility_matrix.9.xml index 4c24acd766..a4c6ea4c99 100644 --- a/compatibility_matrices/compatibility_matrix.9.xml +++ b/compatibility_matrices/compatibility_matrix.9.xml @@ -405,7 +405,7 @@ android.hardware.radio.config - 2 + 3 IRadioConfig default @@ -413,7 +413,7 @@ android.hardware.radio.data - 2 + 3 IRadioData slot1 @@ -423,7 +423,7 @@ android.hardware.radio.messaging - 2 + 3 IRadioMessaging slot1 @@ -433,7 +433,7 @@ android.hardware.radio.modem - 2 + 3 IRadioModem slot1 @@ -443,7 +443,7 @@ android.hardware.radio.network - 2 + 3 IRadioNetwork slot1 @@ -453,7 +453,7 @@ android.hardware.radio.sim - 2 + 3 IRadioSim slot1 @@ -473,7 +473,7 @@ android.hardware.radio.voice - 2 + 3 IRadioVoice slot1 @@ -483,7 +483,7 @@ android.hardware.radio.ims - 1 + 2 IRadioIms slot1 @@ -503,7 +503,7 @@ android.hardware.radio.ims.media - 1 + 2 IImsMedia default diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp index d531d7bf22..72aaa0ffc5 100644 --- a/radio/aidl/Android.bp +++ b/radio/aidl/Android.bp @@ -12,7 +12,6 @@ aidl_interface { vendor_available: true, host_supported: true, srcs: ["android/hardware/radio/*.aidl"], - frozen: true, stability: "vintf", backend: { cpp: { @@ -41,9 +40,8 @@ aidl_interface { vendor_available: true, host_supported: true, srcs: ["android/hardware/radio/config/*.aidl"], - frozen: true, stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: true, @@ -72,7 +70,7 @@ aidl_interface { host_supported: true, srcs: ["android/hardware/radio/data/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: true, @@ -92,8 +90,6 @@ aidl_interface { }, ], - frozen: true, - } aidl_interface { @@ -102,7 +98,7 @@ aidl_interface { host_supported: true, srcs: ["android/hardware/radio/messaging/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: true, @@ -122,8 +118,6 @@ aidl_interface { }, ], - frozen: true, - } aidl_interface { @@ -132,7 +126,7 @@ aidl_interface { host_supported: true, srcs: ["android/hardware/radio/modem/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: true, @@ -152,8 +146,6 @@ aidl_interface { }, ], - frozen: true, - } aidl_interface { @@ -162,7 +154,7 @@ aidl_interface { host_supported: true, srcs: ["android/hardware/radio/network/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: true, @@ -182,8 +174,6 @@ aidl_interface { }, ], - frozen: true, - } aidl_interface { @@ -212,7 +202,6 @@ aidl_interface { }, ], frozen: true, - } aidl_interface { @@ -222,8 +211,8 @@ aidl_interface { srcs: ["android/hardware/radio/sim/*.aidl"], stability: "vintf", imports: [ - "android.hardware.radio-V2", - "android.hardware.radio.config-V2", + "android.hardware.radio-V3", + "android.hardware.radio.config-V3", ], backend: { cpp: { @@ -250,8 +239,6 @@ aidl_interface { }, ], - frozen: true, - } aidl_interface { @@ -260,7 +247,7 @@ aidl_interface { host_supported: true, srcs: ["android/hardware/radio/voice/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: true, @@ -280,8 +267,6 @@ aidl_interface { }, ], - frozen: true, - } aidl_interface { @@ -290,8 +275,8 @@ aidl_interface { srcs: ["android/hardware/radio/ims/media/*.aidl"], stability: "vintf", imports: [ - "android.hardware.radio-V2", - "android.hardware.radio.data-V2", + "android.hardware.radio-V3", + "android.hardware.radio.data-V3", ], backend: { cpp: { @@ -310,8 +295,6 @@ aidl_interface { ], }, ], - frozen: true, - } aidl_interface { @@ -319,7 +302,7 @@ aidl_interface { vendor_available: true, srcs: ["android/hardware/radio/ims/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: false, @@ -334,8 +317,6 @@ aidl_interface { imports: ["android.hardware.radio-V2"], }, ], - frozen: true, - } aidl_interface { @@ -343,7 +324,7 @@ aidl_interface { vendor_available: true, srcs: ["android/hardware/radio/satellite/*.aidl"], stability: "vintf", - imports: ["android.hardware.radio-V2"], + imports: ["android.hardware.radio-V3"], backend: { cpp: { enabled: false, diff --git a/radio/aidl/compat/libradiocompat/Android.bp b/radio/aidl/compat/libradiocompat/Android.bp index 9aecf78d38..f5000b91d0 100644 --- a/radio/aidl/compat/libradiocompat/Android.bp +++ b/radio/aidl/compat/libradiocompat/Android.bp @@ -31,21 +31,21 @@ cc_library { "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION", ], shared_libs: [ - "android.hardware.radio.config-V2-ndk", + "android.hardware.radio.config-V3-ndk", "android.hardware.radio.config@1.0", "android.hardware.radio.config@1.1", "android.hardware.radio.config@1.2", "android.hardware.radio.config@1.3", - "android.hardware.radio.data-V2-ndk", - "android.hardware.radio.ims-V1-ndk", - "android.hardware.radio.ims.media-V1-ndk", - "android.hardware.radio.messaging-V2-ndk", - "android.hardware.radio.modem-V2-ndk", - "android.hardware.radio.network-V2-ndk", + "android.hardware.radio.data-V3-ndk", + "android.hardware.radio.ims-V2-ndk", + "android.hardware.radio.ims.media-V2-ndk", + "android.hardware.radio.messaging-V3-ndk", + "android.hardware.radio.modem-V3-ndk", + "android.hardware.radio.network-V3-ndk", "android.hardware.radio.sap-V1-ndk", "android.hardware.radio.satellite-V1-ndk", - "android.hardware.radio.sim-V2-ndk", - "android.hardware.radio.voice-V2-ndk", + "android.hardware.radio.sim-V3-ndk", + "android.hardware.radio.voice-V3-ndk", "android.hardware.radio@1.0", "android.hardware.radio@1.1", "android.hardware.radio@1.2", diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp index 5d14c85f73..1a6ea48df9 100644 --- a/radio/aidl/compat/service/Android.bp +++ b/radio/aidl/compat/service/Android.bp @@ -34,21 +34,21 @@ cc_binary { ], shared_libs: [ "android.hardware.radio-library.compat", - "android.hardware.radio.config-V2-ndk", + "android.hardware.radio.config-V3-ndk", "android.hardware.radio.config@1.0", "android.hardware.radio.config@1.1", "android.hardware.radio.config@1.2", "android.hardware.radio.config@1.3", - "android.hardware.radio.data-V2-ndk", - "android.hardware.radio.ims-V1-ndk", - "android.hardware.radio.ims.media-V1-ndk", - "android.hardware.radio.messaging-V2-ndk", - "android.hardware.radio.modem-V2-ndk", - "android.hardware.radio.network-V2-ndk", + "android.hardware.radio.data-V3-ndk", + "android.hardware.radio.ims-V2-ndk", + "android.hardware.radio.ims.media-V2-ndk", + "android.hardware.radio.messaging-V3-ndk", + "android.hardware.radio.modem-V3-ndk", + "android.hardware.radio.network-V3-ndk", "android.hardware.radio.sap-V1-ndk", "android.hardware.radio.satellite-V1-ndk", - "android.hardware.radio.sim-V2-ndk", - "android.hardware.radio.voice-V2-ndk", + "android.hardware.radio.sim-V3-ndk", + "android.hardware.radio.voice-V3-ndk", "android.hardware.radio@1.0", "android.hardware.radio@1.1", "android.hardware.radio@1.2", diff --git a/radio/aidl/vts/Android.bp b/radio/aidl/vts/Android.bp index c816ed4b95..8301f103bc 100644 --- a/radio/aidl/vts/Android.bp +++ b/radio/aidl/vts/Android.bp @@ -58,9 +58,9 @@ cc_test { "radio_network_test.cpp", "radio_sap_callback.cpp", "radio_sap_test.cpp", - // "radio_satellite_indication.cpp", - // "radio_satellite_response.cpp", - // "radio_satellite_test.cpp", + "radio_satellite_indication.cpp", + "radio_satellite_response.cpp", + "radio_satellite_test.cpp", "radio_sim_indication.cpp", "radio_sim_response.cpp", "radio_sim_test.cpp", @@ -74,18 +74,18 @@ cc_test { "libvintf", ], static_libs: [ - "android.hardware.radio-V2-ndk", - "android.hardware.radio.config-V2-ndk", - "android.hardware.radio.data-V2-ndk", - "android.hardware.radio.ims-V1-ndk", - "android.hardware.radio.ims.media-V1-ndk", - "android.hardware.radio.messaging-V2-ndk", - "android.hardware.radio.modem-V2-ndk", - "android.hardware.radio.network-V2-ndk", + "android.hardware.radio-V3-ndk", + "android.hardware.radio.config-V3-ndk", + "android.hardware.radio.data-V3-ndk", + "android.hardware.radio.ims-V2-ndk", + "android.hardware.radio.ims.media-V2-ndk", + "android.hardware.radio.messaging-V3-ndk", + "android.hardware.radio.modem-V3-ndk", + "android.hardware.radio.network-V3-ndk", "android.hardware.radio.sap-V1-ndk", "android.hardware.radio.satellite-V1-ndk", - "android.hardware.radio.sim-V2-ndk", - "android.hardware.radio.voice-V2-ndk", + "android.hardware.radio.sim-V3-ndk", + "android.hardware.radio.voice-V3-ndk", ], test_suites: [ "general-tests",