Merge "Remove LTE_CA from HAL" (ed035ca3) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -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>

radio/aidl/Android.bp

+13 −12

Original line number	Diff line number	Diff line
		@@ -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 {
		},
		},
		}

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/RadioAccessFamily.aidl

+3 −0

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

radio/aidl/aidl_api/android.hardware.radio/current/android/hardware/radio/RadioTechnology.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -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,
		}

radio/aidl/android/hardware/radio/RadioAccessFamily.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.