Merge "Clean up some fields and APIs in telephony HIDL interface." (4ba8b469) · Commits · e / os / android_hardware_interfaces

radio/1.0/Android.mk

+38 −0

Original line number	Diff line number	Diff line
		@@ -1555,6 +1555,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (LastCallFailCauseInfo)
		#
		GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCauseInfo.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.radio@1.0::types.LastCallFailCauseInfo

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (LceDataInfo)
		#
		@@ -4475,6 +4494,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (LastCallFailCauseInfo)
		#
		GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCauseInfo.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.radio@1.0::types.LastCallFailCauseInfo

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (LceDataInfo)
		#

radio/1.0/IRadio.hal

+3 −3

Original line number	Diff line number	Diff line
		@@ -1037,7 +1037,7 @@ interface IRadio {
		*
		* Response callback is IRadioCallback.setGsmBroadcastConfigResponse()
		*/
		oneway setGsmBroadcastConfig(int32_t serial, GsmBroadcastSmsConfigInfo configInfo);
		oneway setGsmBroadcastConfig(int32_t serial, vec<GsmBroadcastSmsConfigInfo> configInfo);

		/*
		* Enable or disable the reception of GSM/WCDMA Cell Broadcast SMS
		@@ -1067,7 +1067,7 @@ interface IRadio {
		*
		* Response callback is IRadioCallback.setCdmaBroadcastConfigResponse()
		*/
		oneway setCdmaBroadcastConfig(int32_t serial, CdmaBroadcastSmsConfigInfo configInfo);
		oneway setCdmaBroadcastConfig(int32_t serial, vec<CdmaBroadcastSmsConfigInfo> configInfo);

		/*
		* Enable or disable the reception of CDMA Cell Broadcast SMS

radio/1.0/IRadioResponse.hal

+143 −140

File changed.

Preview size limit exceeded, changes collapsed.

radio/1.0/types.hal

+16 −13

Original line number	Diff line number	Diff line
		@@ -562,8 +562,6 @@ enum SmsAcknowledgeFailCause : int32_t {
		};

		enum CallForwardInfoStatus : int32_t {
		ACTIVE,
		INACTIVE,
		DISABLE,
		ENABLE,
		INTERROGATE,
		@@ -1080,7 +1078,7 @@ struct AppStatus {
		string aidPtr; // e.g., from 0xA0, 0x00 -> 0x41,
		// 0x30, 0x30, 0x30
		string appLabelPtr;
		int32_t pin1Replaced; // applicable to USIM, CSIM & ISIM
		int32_t pin1Replaced; // applicable to USIM, CSIM and ISIM
		PinState pin1;
		PinState pin2;
		};
		@@ -1126,6 +1124,11 @@ struct Dial {
		vec<UusInfo> uusInfo; // Vector of User-User Signaling Information
		};

		struct LastCallFailCauseInfo {
		LastCallFailCause causeCode;
		string vendorCause;
		};

		struct GsmSignalStrength {
		uint32_t signalStrength; // Valid values are (0-61, 99) as defined in
		// TS 27.007 8.69
		@@ -1262,16 +1265,16 @@ struct SetupDataCallResult {

		struct IccIo {
		int32_t command; // one of the commands listed for TS 27.007 +CRSM
		int32_t fileid; // EF id
		int32_t fileId; // EF id
		string path; // "pathid" from TS 27.007 +CRSM command.
		// Path is in hex asciii format eg "7f205f70"
		// Path must always be provided.
		int32_t p1; // Values of p1, p2 & p3 defined as per 3GPP TS 51.011
		int32_t p1; // Values of p1, p2 and p3 defined as per 3GPP TS 51.011
		int32_t p2;
		int32_t p3;
		string data; // information to be written to the SIM
		string pin2;
		string aidPtr; // AID value, See ETSI 102.221 8.1 and 101.220 4, empty
		string aid; // AID value, See ETSI 102.221 8.1 and 101.220 4, empty
		// string if no value.
		};

		@@ -1405,7 +1408,7 @@ struct DataRegStateResult {
		// See also com.android.internal.telephony.gsm.CallForwardInfo
		struct CallForwardInfo {
		CallForwardInfoStatus status; // For queryCallForwardStatus()
		// status must be ACTIVE, INACTIVE
		// status is DISABLE (Not used by vendor code currently)
		// For setCallForward():
		// status must be
		// DISABLE, ENABLE, INTERROGATE, REGISTRATION, ERASURE
		@@ -1437,7 +1440,7 @@ struct SmsWriteArgs {
		};

		struct CdmaSmsAddress {
		CdmaSmsDigitMode digitMode; // CdmaSmsDigitMode is of two types : 4 bit & 8 bit.
		CdmaSmsDigitMode digitMode; // CdmaSmsDigitMode is of two types : 4 bit and 8 bit.
		// For 4-bit type, only "digits" field defined below in
		// this struct is used.
		CdmaSmsNumberMode numberMode; // Used only when digitMode is 8-bit
		@@ -1613,7 +1616,7 @@ struct CellInfo {
		bool registered; // true if this cell is registered false if not registered
		TimeStampType timeStampType; // type of time stamp represented by timeStamp
		uint64_t timeStamp; // Time in nanos as returned by ril_nano_time
		// Only one of the below vectors must be of size 1 based on the CellInfoType & others must be
		// Only one of the below vectors must be of size 1 based on the CellInfoType and others must be
		// of size 0
		vec<CellInfoGsm> gsm; // Valid only if type = gsm and size = 1 else must be empty
		vec<CellInfoCdma> cdma; // Valid only if type = cdma and size = 1 else must be
		@@ -1640,7 +1643,7 @@ struct ImsSmsMessage {
		int32_t messageRef; // Valid field if retry is set to true.
		// Contains messageRef from SendSmsResult stuct
		// corresponding to failed MO SMS.
		// Only one of the below vectors must be of size 1 based on the RadioTechnologyFamily & others
		// Only one of the below vectors must be of size 1 based on the RadioTechnologyFamily and others
		// must be of size 0
		vec<CdmaSmsMessage> cdmaMessage; // Valid field if tech is 3GPP2 and size = 1 else must be
		// empty
		@@ -1649,7 +1652,7 @@ struct ImsSmsMessage {
		};

		struct SimApdu {
		int32_t sessionid; // "sessionid" from TS 27.007 +CGLA command. Must be
		int32_t sessionId; // "sessionid" from TS 27.007 +CGLA command. Must be
		// ignored for +CSIM command.
		// Following fields are used to derive the APDU ("command" and "length"
		// values in TS 27.007 +CSIM and +CGLA commands).
		@@ -1662,7 +1665,7 @@ struct SimApdu {
		};

		struct NvWriteItem {
		NvItem itemID;
		NvItem itemId;
		string value;
		};