Merge "Update 1.5 IRadio interface with missing structs/functions" (39e563b2) · Commits · e / os / android_hardware_interfaces

current.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -643,7 +643,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar
	619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback		619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
	c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork		c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
	9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types		9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
	85af67af743b8cebb65023f196ee3df0e57b88c84d048f40439e98f845bab3d6 android.hardware.radio@1.5::types		b0c291c1ee1592b7b12f7bf02bad4cec4bf4f2e41fbd044a9c3885b188114c88 android.hardware.radio@1.5::types
	e5947273509cd23b432c1a0781245a1e5a1dedca77f41db6dbcc02c0d7a7e40a android.hardware.radio@1.5::IRadio		e5947273509cd23b432c1a0781245a1e5a1dedca77f41db6dbcc02c0d7a7e40a android.hardware.radio@1.5::IRadio
	e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication		fcbb0742a88215ee7a6d7ce0825d253eb2b50391fc6c8c48667f9fd7f6d4549e android.hardware.radio@1.5::IRadioIndication
	6759e59cef81b5e15137bf99a4cd14236ce0c2974dd307ada265b67e819b9060 android.hardware.radio@1.5::IRadioResponse		b9789e8286be3f3390bdef054f38eb7a2052fd9b611613813f5d7e40a465c2c9 android.hardware.radio@1.5::IRadioResponse

radio/1.5/IRadioIndication.hal

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -95,4 +95,21 @@ interface IRadioIndication extends @1.4::IRadioIndication {
	* CellInfo.		* CellInfo.
	*/		*/
	oneway networkScanResult_1_5(RadioIndicationType type, NetworkScanResult result);		oneway networkScanResult_1_5(RadioIndicationType type, NetworkScanResult result);

			/**
			* Indicates data call contexts have changed.
			*
			* This indication is updated from IRadioIndication@1.4 to report the @1.5 version of
			* SetupDataCallResult.
			*
			* @param type Type of radio indication
			* @param dcList Array of SetupDataCallResult identical to that returned by
			* IRadio.getDataCallList(). It is the complete list of current data contexts including
			* new contexts that have been activated. A data call is only removed from this list
			* when below conditions matched.
			* 1. The framework sends a IRadio.deactivateDataCall().
			* 2. The radio is powered off/on.
			* 3. Unsolicited disconnect from either modem or network side.
			*/
			oneway dataCallListChanged_1_5(RadioIndicationType type, vec<SetupDataCallResult> dcList);
	};		};

radio/1.5/IRadioResponse.hal

+29 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import @1.0::RadioResponseInfo;
	import @1.0::SendSmsResult;		import @1.0::SendSmsResult;
	import @1.4::IRadioResponse;		import @1.4::IRadioResponse;
	import @1.5::BarringInfo;		import @1.5::BarringInfo;
			import @1.5::CardStatus;
	import @1.5::CellInfo;		import @1.5::CellInfo;
	import @1.5::PersoSubstate;		import @1.5::PersoSubstate;
	import @1.5::RegStateResult;		import @1.5::RegStateResult;
	@@ -117,6 +118,20 @@ interface IRadioResponse extends @1.4::IRadioResponse {
	*/		*/
	oneway setupDataCallResponse_1_5(RadioResponseInfo info, SetupDataCallResult dcResponse);		oneway setupDataCallResponse_1_5(RadioResponseInfo info, SetupDataCallResult dcResponse);

			/**
			* @param info Response info struct containing response type, serial no. and error
			* @param dcResponse List of SetupDataCallResult as defined in types.hal
			*
			* Valid errors returned:
			* RadioError:NONE
			* RadioError:RADIO_NOT_AVAILABLE
			* RadioError:INTERNAL_ERR
			* RadioError:NO_RESOURCES
			* RadioError:REQUEST_NOT_SUPPORTED
			* RadioError:SIM_ABSENT
			*/
			oneway getDataCallListResponse_1_5(RadioResponseInfo info, vec<SetupDataCallResult> dcResponse);

	/**		/**
	* @param info Response info struct containing response type, serial no. and error		* @param info Response info struct containing response type, serial no. and error
	*		*
	@@ -301,4 +316,17 @@ interface IRadioResponse extends @1.4::IRadioResponse {
	*/		*/
	oneway supplySimDepersonalizationResponse(RadioResponseInfo info,		oneway supplySimDepersonalizationResponse(RadioResponseInfo info,
	PersoSubstate persoType, int32_t remainingRetries);		PersoSubstate persoType, int32_t remainingRetries);

			/**
			* @param info Response info struct containing response type, serial no. and error
			* @param cardStatus ICC card status as defined by CardStatus in types.hal
			*
			* Valid errors returned:
			* RadioError:NONE
			* RadioError:RADIO_NOT_AVAILABLE
			* RadioError:INTERNAL_ERR
			* RadioError:NO_RESOURCES
			* RadioError:REQUEST_NOT_SUPPORTED
			*/
			oneway getIccCardStatusResponse_1_5(RadioResponseInfo info, CardStatus cardStatus);
	};		};

radio/1.5/types.hal

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.hardware.radio@1.5;		package android.hardware.radio@1.5;

	import @1.0::ApnAuthType;		import @1.0::ApnAuthType;
			import @1.0::AppStatus;
	import @1.0::DataProfileId;		import @1.0::DataProfileId;
	import @1.0::DataProfileInfoType;		import @1.0::DataProfileInfoType;
	import @1.0::GsmSignalStrength;		import @1.0::GsmSignalStrength;
	@@ -43,6 +44,7 @@ import @1.2::TdscdmaSignalStrength;
	import @1.2::WcdmaSignalStrength;		import @1.2::WcdmaSignalStrength;
	import @1.4::AccessNetwork;		import @1.4::AccessNetwork;
	import @1.4::ApnTypes;		import @1.4::ApnTypes;
			import @1.4::CardStatus;
	import @1.4::CellIdentityNr;		import @1.4::CellIdentityNr;
	import @1.4::DataCallFailCause;		import @1.4::DataCallFailCause;
	import @1.4::DataConnActiveStatus;		import @1.4::DataConnActiveStatus;
	@@ -1043,3 +1045,20 @@ enum PersoSubstate : @1.0::PersoSubstate {
	SIM_NS_SP,		SIM_NS_SP,
	SIM_NS_SP_PUK,		SIM_NS_SP_PUK,
	};		};

			/** Extended from @1.0::AppStatus to update PersoSubstate to 1.5 version. */
			struct AppStatus {
			@1.0::AppStatus base;

			/** Applicable only if appState == SUBSCRIPTION_PERSO */
			PersoSubstate persoSubstate;
			};


			/** Extended from @1.4::CardStatus to use 1.5 version of AppStatus. */
			struct CardStatus {
			@1.4::CardStatus base;

			/** size <= RadioConst::CARD_MAX_APPS */
			vec<AppStatus> applications;
			};

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+33 −33

Original line number	Original line	Diff line number	Diff line
	@@ -408,7 +408,7 @@ TEST_F(RadioHidlTest_v1_5, setLinkCapacityReportingCriteria_1_5_Geran) {
	*/		*/
	TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimAbsent) {		TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimAbsent) {
	// This test case only test SIM ABSENT case.		// This test case only test SIM ABSENT case.
	if (cardStatus.base.base.cardState != CardState::ABSENT) return;		if (cardStatus.base.base.base.cardState != CardState::ABSENT) return;

	// Disable Uicc applications.		// Disable Uicc applications.
	serial = GetRandomSerialNumber();		serial = GetRandomSerialNumber();
	@@ -435,7 +435,7 @@ TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimAbsent) {
	*/		*/
	TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimPresent) {		TEST_F(RadioHidlTest_v1_5, togglingUiccApplicationsSimPresent) {
	// This test case only test SIM ABSENT case.		// This test case only test SIM ABSENT case.
	if (cardStatus.base.base.cardState != CardState::PRESENT) return;		if (cardStatus.base.base.base.cardState != CardState::PRESENT) return;

	// Disable Uicc applications.		// Disable Uicc applications.
	serial = GetRandomSerialNumber();		serial = GetRandomSerialNumber();
	@@ -489,9 +489,9 @@ TEST_F(RadioHidlTest_v1_5, areUiccApplicationsEnabled) {

	// If SIM is absent, RadioError::SIM_ABSENT should be thrown. Otherwise there shouldn't be any		// If SIM is absent, RadioError::SIM_ABSENT should be thrown. Otherwise there shouldn't be any
	// error.		// error.
	if (cardStatus.base.base.cardState == CardState::ABSENT) {		if (cardStatus.base.base.base.cardState == CardState::ABSENT) {
	EXPECT_EQ(RadioError::SIM_ABSENT, radioRsp_v1_5->rspInfo.error);		EXPECT_EQ(RadioError::SIM_ABSENT, radioRsp_v1_5->rspInfo.error);
	} else if (cardStatus.base.base.cardState == CardState::PRESENT) {		} else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {
	EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);		EXPECT_EQ(RadioError::NONE, radioRsp_v1_5->rspInfo.error);
	}		}
	}		}
	@@ -563,9 +563,9 @@ TEST_F(RadioHidlTest_v1_5, startNetworkScan) {
	EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);		EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
	ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_5->rspInfo.error).c_str());		ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_5->rspInfo.error).c_str());

	if (cardStatus.base.base.cardState == CardState::ABSENT) {		if (cardStatus.base.base.base.cardState == CardState::ABSENT) {
	ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT}));		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT}));
	} else if (cardStatus.base.base.cardState == CardState::PRESENT) {		} else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {
	// OPERATION_NOT_ALLOWED should not be allowed; however, some vendors do		// OPERATION_NOT_ALLOWED should not be allowed; however, some vendors do
	// not support the required manual GSM search functionality. This is		// not support the required manual GSM search functionality. This is
	// tracked in b/112206766. Modems have "GSM" rat scan need to		// tracked in b/112206766. Modems have "GSM" rat scan need to
	@@ -592,10 +592,10 @@ TEST_F(RadioHidlTest_v1_5, startNetworkScan_InvalidArgument) {
	ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",		ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",
	toString(radioRsp_v1_5->rspInfo.error).c_str());		toString(radioRsp_v1_5->rspInfo.error).c_str());