Merge "Add a Registration Failure indication to IRadio" am: f1a6e2e828 am: e4533e4090 (29352779) · Commits · e / os / android_hardware_interfaces

current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -610,9 +610,9 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar
		619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
		c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
		9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
		b91398c7475d9f6decb760f6e4721bab8bd588b6d36115d3048ebbfdf70ccf7b android.hardware.radio@1.5::types
		17f92261051ee7f08662a9d09a4a7af629551194018ff65855b3740fa22b6094 android.hardware.radio@1.5::types
		5ae0401fdaad9b85de7bebc5bdd7388a4ea661c46f1e4929341981b0540c67de android.hardware.radio@1.5::IRadio
		3afac66f21a33bc9c4b80481c7d5540038348651d9a7d8af64ea13610af138da android.hardware.radio@1.5::IRadioIndication
		bc59237dbd93949238081f762710552e76670cb648c0e198138551460ac54b1e android.hardware.radio@1.5::IRadioIndication
		f4888f9676890b43a459c6380f335fea7a6ad32ed3bafafeb018a88d6c0be8a4 android.hardware.radio@1.5::IRadioResponse
		55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types
		b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig

radio/1.5/IRadioIndication.hal

+29 −0

Original line number	Diff line number	Diff line
		@@ -30,4 +30,33 @@ interface IRadioIndication extends @1.4::IRadioIndication {
		* @param enabled whether uiccApplications are enabled, or disabled
		*/
		oneway uiccApplicationsEnablementChanged(RadioIndicationType type, bool enabled);

		/**
		* Report that Registration or a Location/Routing/Tracking Area update has failed.
		*
		* <p>Indicate whenever a registration procedure, including a location, routing, or tracking
		* area update fails. This includes procedures that do not necessarily result in a change of
		* the modem's registration status. If the modem's registration status changes, that is
		* reflected in the onNetworkStateChanged() and subsequent get{Voice/Data}RegistrationState().
		*
		* @param cellIdentity the CellIdentity, which must include the globally unique identifier for
		* the cell (for example, all components of the CGI or ECGI).
		* @param chosenPlmn a 5 or 6 digit alphanumeric PLMN (MCC\|MNC) among those broadcast by the
		* cell that was chosen for the failed registration attempt.
		* @param domain Domain::CS, Domain::PS, or both in case of a combined procedure.
		* @param causeCode the primary failure cause code of the procedure.
		* For GSM/UMTS (MM), values are in TS 24.008 Sec 10.5.95
		* For GSM/UMTS (GMM), values are in TS 24.008 Sec 10.5.147
		* For LTE (EMM), cause codes are TS 24.301 Sec 9.9.3.9
		* For NR (5GMM), cause codes are TS 24.501 Sec 9.11.3.2
		* MAX_INT if this value is unused.
		* @param additionalCauseCode the cause code of any secondary/combined procedure if appropriate.
		* For UMTS, if a combined attach succeeds for PS only, then the GMM cause code shall be
		* included as an additionalCauseCode.
		* For LTE (ESM), cause codes are in TS 24.301 9.9.4.4
		* MAX_INT if this value is unused.
		*/
		oneway registrationFailed(
		RadioIndicationType type, CellIdentity cellIdentity, string chosenPlmn,
		bitfield<Domain> domain, int32_t causeCode, int32_t additionalCauseCode);
		};

radio/1.5/types.hal

+27 −0

Original line number	Diff line number	Diff line
		@@ -22,14 +22,22 @@ import @1.1::RadioAccessNetworks;
		import @1.1::RadioAccessSpecifier;
		import @1.1::ScanType;
		import @1.1::UtranBands;
		import @1.2::CellIdentityCdma;
		import @1.2::CellIdentityGsm;
		import @1.2::CellIdentityWcdma;
		import @1.2::CellIdentityTdscdma;
		import @1.2::CellIdentityLte;
		import @1.2::NetworkScanRequest;
		import @1.4::AccessNetwork;
		import @1.4::ApnTypes;
		import @1.4::CellIdentityNr;
		import @1.4::DataCallFailCause;
		import @1.4::DataConnActiveStatus;
		import @1.4::DataProfileInfo;
		import @1.4::PdpProtocolType;

		import android.hidl.safe_union@1.0::Monostate;

		/**
		* Defining signal strength type.
		*/
		@@ -394,3 +402,22 @@ struct SetupDataCallResult {
		int32_t mtu;
		};

		enum Domain : int32_t {
		/** Circuit-switched */
		CS = 1 << 0,

		/** Packet-switched */
		PS = 1 << 1,
		};

		/** A union representing the CellIdentity of a single cell */
		safe_union CellIdentity {
		Monostate noinit;

		CellIdentityGsm gsm;
		CellIdentityWcdma wcdma;
		CellIdentityTdscdma tdscdma;
		CellIdentityCdma cdma;
		CellIdentityLte lte;
		CellIdentityNr nr;
		};

radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -739,6 +739,13 @@ class RadioIndication_v1_5 : public ::android::hardware::radio::V1_5::IRadioIndi

		Return<void> modemReset(RadioIndicationType type,
		const ::android::hardware::hidl_string& reason);

		Return<void> registrationFailed(
		RadioIndicationType type,
		const ::android::hardware::radio::V1_5::CellIdentity& cellIdentity,
		const ::android::hardware::hidl_string& chosenPlmn,
		::android::hardware::hidl_bitfield<::android::hardware::radio::V1_5::Domain> domain,
		int32_t causeCode, int32_t additionalCauseCode);
		};

		// Test environment for Radio HIDL HAL.

radio/1.5/vts/functional/radio_indication.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -333,3 +333,12 @@ Return<void> RadioIndication_v1_5::uiccApplicationsEnablementChanged(RadioIndica
		bool /enabled/) {
		return Void();
		}

		Return<void> RadioIndication_v1_5::registrationFailed(
		RadioIndicationType /type/,
		const ::android::hardware::radio::V1_5::CellIdentity& /cellIdentity/,
		const ::android::hardware::hidl_string& /chosenPlmn/,
		::android::hardware::hidl_bitfield<::android::hardware::radio::V1_5::Domain> /domain/,
		int32_t /causeCode/, int32_t /additionalCauseCode/) {
		return Void();
		}