Merge "Fix more AIDL warnings in Radio HAL and lock it up" into main (0bd3d52c) · Commits · e / os / android_hardware_interfaces

radio/aidl/Android.bp

+11 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/*.aidl"],
		stability: "vintf",
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -48,6 +49,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/config/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -82,6 +84,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/data/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -115,6 +118,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/messaging/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -148,6 +152,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/modem/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -181,6 +186,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/network/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -213,6 +219,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/sap/*.aidl"],
		stability: "vintf",
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -241,6 +248,7 @@ aidl_interface {
		host_supported: true,
		srcs: ["android/hardware/radio/sim/*.aidl"],
		stability: "vintf",
		flags: ["-Werror"],
		imports: [
		"android.hardware.radio-V4",
		"android.hardware.radio.config-V4",
		@@ -287,6 +295,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/voice/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: true,
		@@ -322,6 +331,7 @@ aidl_interface {
		"android.hardware.radio-V4",
		"android.hardware.radio.data-V4",
		],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: false,
		@@ -356,6 +366,7 @@ aidl_interface {
		srcs: ["android/hardware/radio/ims/*.aidl"],
		stability: "vintf",
		imports: ["android.hardware.radio-V4"],
		flags: ["-Werror"],
		backend: {
		cpp: {
		enabled: false,

radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl

+4 −3

Original line number	Diff line number	Diff line
		@@ -17,9 +17,10 @@
		* This interface is used by telephony and telecom to talk to cellular radio for the purpose of
		* radio configuration, and it is not associated with any specific modem or slot.
		* All the functions have minimum one parameter:
		* serial: which corresponds to serial no. of request. Serial numbers must only be memorized for the
		* duration of a method call. If clients provide colliding serials (including passing the same
		* serial to different methods), multiple responses (one for each method call) must still be served.
		* serial: which corresponds to the serial number of the request. Serial numbers must only be
		* memorized for the duration of a method call. If clients provide colliding serials (including
		* passing the same serial to different methods), multiple responses (one for each method call) must
		* still be served.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataCallFailCause.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@

		package android.hardware.radio.data;
		/* @hide */
		@Backing(type="int") @JavaDerive(toString=true) @VintfStability
		@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
		enum DataCallFailCause {
		NONE = 0,
		OPERATOR_BARRED = 0x08,

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@ package android.hardware.radio.data;
		parcelable DataProfileInfo {
		int profileId;
		String apn;
		android.hardware.radio.data.PdpProtocolType protocol;
		android.hardware.radio.data.PdpProtocolType roamingProtocol;
		android.hardware.radio.data.ApnAuthType authType;
		android.hardware.radio.data.PdpProtocolType protocol = android.hardware.radio.data.PdpProtocolType.IP;
		android.hardware.radio.data.PdpProtocolType roamingProtocol = android.hardware.radio.data.PdpProtocolType.IP;
		android.hardware.radio.data.ApnAuthType authType = android.hardware.radio.data.ApnAuthType.NO_PAP_NO_CHAP;
		String user;
		String password;
		int type;

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataThrottlingAction.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@

		package android.hardware.radio.data;
		/* @hide */
		@Backing(type="byte") @JavaDerive(toString=true) @VintfStability
		@Backing(type="byte") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
		enum DataThrottlingAction {
		NO_DATA_THROTTLING,
		THROTTLE_SECONDARY_CARRIER,