Merge "Use RadioConst to define undefined magic constants" into main (a87df9ff) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.202504.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.config</name>
		<version>3</version>
		<version>3-4</version>
		<interface>
		<name>IRadioConfig</name>
		<instance>default</instance>
		@@ -406,7 +406,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.messaging</name>
		<version>3</version>
		<version>3-4</version>
		<interface>
		<name>IRadioMessaging</name>
		<instance>slot1</instance>
		@@ -416,7 +416,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.modem</name>
		<version>3</version>
		<version>3-4</version>
		<interface>
		<name>IRadioModem</name>
		<instance>slot1</instance>
		@@ -426,7 +426,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.network</name>
		<version>3</version>
		<version>3-4</version>
		<interface>
		<name>IRadioNetwork</name>
		<instance>slot1</instance>
		@@ -436,7 +436,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.sim</name>
		<version>3</version>
		<version>3-4</version>
		<interface>
		<name>IRadioSim</name>
		<instance>slot1</instance>
		@@ -456,7 +456,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.voice</name>
		<version>3</version>
		<version>3-4</version>
		<interface>
		<name>IRadioVoice</name>
		<instance>slot1</instance>
		@@ -466,7 +466,7 @@
		</hal>
		<hal format="aidl">
		<name>android.hardware.radio.ims</name>
		<version>2</version>
		<version>2-3</version>
		<interface>
		<name>IRadioIms</name>
		<instance>slot1</instance>

radio/aidl/Android.bp

+18 −18

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,

		}

		@@ -47,7 +47,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/config/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: true,
		@@ -71,7 +71,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,

		}

		@@ -81,7 +81,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/data/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: true,
		@@ -114,7 +114,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/messaging/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: true,
		@@ -138,7 +138,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,
		}

		aidl_interface {
		@@ -147,7 +147,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/modem/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: true,
		@@ -171,7 +171,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,
		}

		aidl_interface {
		@@ -180,7 +180,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/network/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: true,
		@@ -204,7 +204,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,
		}

		aidl_interface {
		@@ -242,8 +242,8 @@ aidl_interface {
		srcs: ["android/hardware/radio/sim/*.aidl"],
		stability: "vintf",
		imports: [
		"android.hardware.radio-V3",
		"android.hardware.radio.config-V3",
		"android.hardware.radio-V4",
		"android.hardware.radio.config-V4",
		],
		backend: {
		cpp: {
		@@ -277,7 +277,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,
		}

		aidl_interface {
		@@ -286,7 +286,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/voice/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: true,
		@@ -310,7 +310,7 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,
		}

		aidl_interface {
		@@ -319,7 +319,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/ims/media/*.aidl"],
		stability: "vintf",
		imports: [
		"android.hardware.radio-V3",
		"android.hardware.radio-V4",
		"android.hardware.radio.data-V4",
		],
		backend: {
		@@ -355,7 +355,7 @@ aidl_interface {
		vendor_available: true,
		srcs: ["android/hardware/radio/ims/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V3"],
		imports: ["android.hardware.radio-V4"],
		backend: {
		cpp: {
		enabled: false,
		@@ -375,5 +375,5 @@ aidl_interface {
		},

		],
		frozen: true,
		frozen: false,
		}

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/NrSignalStrength.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,5 +43,5 @@ parcelable NrSignalStrength {
		int csiSinr;
		int csiCqiTableIndex;
		byte[] csiCqiReport;
		int timingAdvance = 0x7FFFFFFF;
		int timingAdvance = android.hardware.radio.RadioConst.VALUE_UNAVAILABLE /* 2147483647 */;
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@ package android.hardware.radio;
		/* @hide */
		@JavaDerive(toString=true) @VintfStability
		parcelable RadioConst {
		const int VALUE_UNAVAILABLE = 0x7FFFFFFF;
		const long VALUE_UNAVAILABLE_LONG = 0x7FFFFFFFFFFFFFFF;
		const byte VALUE_UNAVAILABLE_BYTE = 0xFFu8;
		const int MAX_RILDS = 3;
		const int MAX_UUID_LENGTH = 64;
		const int CARD_MAX_APPS = 8;

radio/aidl/android/hardware/radio/RadioConst.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ package android.hardware.radio;
		@VintfStability
		@JavaDerive(toString=true)
		parcelable RadioConst {
		const int VALUE_UNAVAILABLE = 0x7FFFFFFF;
		const long VALUE_UNAVAILABLE_LONG = 0x7FFFFFFFFFFFFFFF;
		const byte VALUE_UNAVAILABLE_BYTE = 0xFFu8;
		const int MAX_RILDS = 3;
		const int MAX_UUID_LENGTH = 64;
		const int CARD_MAX_APPS = 8;