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 "Remove LTE_CA from HAL"

Browse Source
This commit is contained in:
Sarah Chin
2022-11-18 18:40:24 +00:00
committed by Android (Google) Code Review
parent d2e68f1579 ef437d900f
commit ed035ca3e1
11 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compatibility_matrices/compatibility_matrix.current.xml
View File

@@ -439,7 +439,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.config</name>
<version>1</version>
<version>2</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
@@ -447,7 +447,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.data</name>
<version>1</version>
<version>2</version>
<interface>
<name>IRadioData</name>
<instance>slot1</instance>
@@ -457,7 +457,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.messaging</name>
<version>1</version>
<version>2</version>
<interface>
<name>IRadioMessaging</name>
<instance>slot1</instance>
@@ -487,7 +487,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.sim</name>
<version>1</version>
<version>2</version>
<interface>
<name>IRadioSim</name>
<instance>slot1</instance>
@@ -497,7 +497,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.voice</name>
<version>1</version>
<version>2</version>
<interface>
<name>IRadioVoice</name>
<instance>slot1</instance>

25
radio/aidl/Android.bp
View File

@@ -36,7 +36,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/config/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: true,
@@ -60,7 +60,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/data/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: true,
@@ -84,7 +84,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/messaging/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: true,
@@ -108,7 +108,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/modem/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: true,
@@ -132,7 +132,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/network/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: true,
@@ -157,8 +157,8 @@ aidl_interface {
srcs: ["android/hardware/radio/sim/*.aidl"],
stability: "vintf",
imports: [
"android.hardware.radio-V1",
"android.hardware.radio.config",
"android.hardware.radio-V2",
"android.hardware.radio.config-V2",
],
backend: {
cpp: {
@@ -186,7 +186,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/voice/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: true,
@@ -209,8 +209,10 @@ aidl_interface {
vendor_available: true,
srcs: ["android/hardware/radio/ims/media/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1",
"android.hardware.radio.data-V1"],
imports: [
"android.hardware.radio-V2",
"android.hardware.radio.data-V2",
],
backend: {
cpp: {
enabled: false,
@@ -226,7 +228,7 @@ aidl_interface {
vendor_available: true,
srcs: ["android/hardware/radio/ims/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V1"],
imports: ["android.hardware.radio-V2"],
backend: {
cpp: {
enabled: false,
@@ -236,4 +238,3 @@ aidl_interface {
},
},
}

3
radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/RadioAccessFamily.aidl
View File

@@ -53,6 +53,9 @@ enum RadioAccessFamily {
GSM = 65536,
TD_SCDMA = 131072,
IWLAN = 262144,
/**
* @deprecated use LTE instead.
*/
LTE_CA = 524288,
NR = 1048576,
}

3
radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/RadioTechnology.aidl
View File

@@ -53,6 +53,9 @@ enum RadioTechnology {
GSM = 16,
TD_SCDMA = 17,
IWLAN = 18,
/**
* @deprecated use LTE instead and indicate carrier aggregation through multiple physical channel configurations in IRadioNetwork::currentPhysicalChannelConfigs.
*/
LTE_CA = 19,
NR = 20,
}

1
radio/aidl/android/hardware/radio/RadioAccessFamily.aidl
View File

@@ -41,6 +41,7 @@ enum RadioAccessFamily {
GSM = 1 << RadioTechnology.GSM,
TD_SCDMA = 1 << RadioTechnology.TD_SCDMA,
IWLAN = 1 << RadioTechnology.IWLAN,
/** @deprecated use LTE instead. */
LTE_CA = 1 << RadioTechnology.LTE_CA,
/**
* 5G NR. This is only use in 5G Standalone mode.

4
radio/aidl/android/hardware/radio/RadioTechnology.aidl
View File

@@ -45,6 +45,10 @@ enum RadioTechnology {
GSM,
TD_SCDMA,
IWLAN,
/**
* @deprecated use LTE instead and indicate carrier aggregation through multiple
* physical channel configurations in IRadioNetwork::currentPhysicalChannelConfigs.
*/
LTE_CA,
/**
* 5G NR. This is only used in 5G Standalone mode.

6
radio/aidl/android/hardware/radio/network/RegStateResult.aidl
View File

@@ -33,9 +33,9 @@ parcelable RegStateResult {
*/
RegState regState;
/**
* Indicates the radio technology (except LTE_CA, which is no longer a valid value), which
* must not be UNKNOWN if regState is REG_HOME, REG_ROAMING, NOT_REG_MT_NOT_SEARCHING_OP_EM,
* NOT_REG_MT_SEARCHING_OP_EM, REG_DENIED_EM, or UNKNOWN_EM.
* Indicates the radio technology, which must not be UNKNOWN if regState is REG_HOME,
* REG_ROAMING, NOT_REG_MT_NOT_SEARCHING_OP_EM, NOT_REG_MT_SEARCHING_OP_EM, REG_DENIED_EM,
* or UNKNOWN_EM.
* When the device is on carrier aggregation, vendor RIL service must properly report multiple
* PhysicalChannelConfig elements through IRadioNetwork::currentPhysicalChannelConfigs.
*/

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

@@ -31,18 +31,18 @@ cc_library {
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
shared_libs: [
"android.hardware.radio.config-V1-ndk",
"android.hardware.radio.config-V2-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-V1-ndk",
"android.hardware.radio.data-V2-ndk",
"android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.messaging-V1-ndk",
"android.hardware.radio.messaging-V2-ndk",
"android.hardware.radio.modem-V2-ndk",
"android.hardware.radio.network-V2-ndk",
"android.hardware.radio.sim-V1-ndk",
"android.hardware.radio.voice-V1-ndk",
"android.hardware.radio.sim-V2-ndk",
"android.hardware.radio.voice-V2-ndk",
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.2",

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

@@ -34,18 +34,18 @@ cc_binary {
],
shared_libs: [
"android.hardware.radio-library.compat",
"android.hardware.radio.config-V1-ndk",
"android.hardware.radio.config-V2-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-V1-ndk",
"android.hardware.radio.data-V2-ndk",
"android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.messaging-V1-ndk",
"android.hardware.radio.messaging-V2-ndk",
"android.hardware.radio.modem-V2-ndk",
"android.hardware.radio.network-V2-ndk",
"android.hardware.radio.sim-V1-ndk",
"android.hardware.radio.voice-V1-ndk",
"android.hardware.radio.sim-V2-ndk",
"android.hardware.radio.voice-V2-ndk",
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.2",

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

@@ -66,15 +66,15 @@ cc_test {
"libvintf",
],
static_libs: [
"android.hardware.radio-V1-ndk",
"android.hardware.radio.config-V1-ndk",
"android.hardware.radio.data-V1-ndk",
"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.messaging-V1-ndk",
"android.hardware.radio.messaging-V2-ndk",
"android.hardware.radio.modem-V2-ndk",
"android.hardware.radio.network-V2-ndk",
"android.hardware.radio.sim-V1-ndk",
"android.hardware.radio.voice-V1-ndk",
"android.hardware.radio.sim-V2-ndk",
"android.hardware.radio.voice-V2-ndk",
],
test_suites: [
"general-tests",

2
radio/aidl/vts/radio_network_test.cpp
View File

@@ -1501,7 +1501,7 @@ TEST_P(RadioNetworkTest, getDataRegistrationState) {
RadioTechnology rat = radioRsp_network->dataRegResp.rat;
// TODO: add logic for cdmaInfo
if (rat == RadioTechnology::LTE || rat == RadioTechnology::LTE_CA) {
if (rat == RadioTechnology::LTE) {
ASSERT_EQ(info.getTag(), AccessTechnologySpecificInfo::eutranInfo);
} else if (rat == RadioTechnology::NR) {
ASSERT_TRUE(info.getTag() == AccessTechnologySpecificInfo::ngranNrVopsInfo);