Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Enable OEM_PAID and OEM_PRIVATE APN types"" into main am: 0cccbfad49

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3318276

Change-Id: Iab2e6ce500441465f55aece154a9c9eec4886f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liana Kazanova
2024-10-24 00:23:17 +00:00
committed by Automerger Merge Worker
parent 746560704a 0cccbfad49
commit fa668af86d
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compatibility_matrices/compatibility_matrix.202504.xml
View File

@@ -396,7 +396,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.data</name>
<version>3-4</version>
<version>3</version>
<interface>
<name>IRadioData</name>
<instance>slot1</instance>
@@ -476,7 +476,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.ims.media</name>
<version>2-3</version>
<version>2</version>
<interface>
<name>IImsMedia</name>
<instance>default</instance>

6
radio/aidl/Android.bp
View File

@@ -105,7 +105,7 @@ aidl_interface {
},
],
frozen: false,
frozen: true,
}
aidl_interface {
@@ -320,7 +320,7 @@ aidl_interface {
stability: "vintf",
imports: [
"android.hardware.radio-V3",
"android.hardware.radio.data-V4",
"android.hardware.radio.data-V3",
],
backend: {
cpp: {
@@ -347,7 +347,7 @@ aidl_interface {
},
],
frozen: false,
frozen: true,
}
aidl_interface {

2
radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/ApnTypes.aidl
View File

@@ -52,6 +52,4 @@ enum ApnTypes {
BIP = (1 << 13) /* 8192 */,
ENTERPRISE = (1 << 14) /* 16384 */,
RCS = (1 << 15) /* 32768 */,
OEM_PAID = (1 << 16) /* 65536 */,
OEM_PRIVATE = (1 << 17) /* 131072 */,
}

8
radio/aidl/android/hardware/radio/data/ApnTypes.aidl
View File

@@ -91,12 +91,16 @@ enum ApnTypes {
* APN type for RCS (Rich Communication Services)
*/
RCS = 1 << 15,
/**
* APN type for OEM_PAID networks (Automotive PANS)
*/
OEM_PAID = 1 << 16,
// TODO(b/366194627): enable once HAL unfreezes
// OEM_PAID = 1 << 16,
/**
* APN type for OEM_PRIVATE networks (Automotive PANS)
*/
OEM_PRIVATE = 1 << 17,
// TODO(b/366194627): enable once HAL unfreezes
// OEM_PRIVATE = 1 << 17,
}

4
radio/aidl/compat/libradiocompat/Android.bp
View File

@@ -37,9 +37,9 @@ cc_library {
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio.data-V4-ndk",
"android.hardware.radio.data-V3-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims.media-V3-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",

4
radio/aidl/compat/service/Android.bp
View File

@@ -40,9 +40,9 @@ cc_binary {
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio.data-V4-ndk",
"android.hardware.radio.data-V3-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims.media-V3-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",

4
radio/aidl/vts/Android.bp
View File

@@ -79,9 +79,9 @@ cc_test {
static_libs: [
"android.hardware.radio-V3-ndk",
"android.hardware.radio.config-V3-ndk",
"android.hardware.radio.data-V4-ndk",
"android.hardware.radio.data-V3-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims.media-V3-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",