Merge "Add mnc and modify docs for emergencyDial" (404e4309) · Commits · e / os / android_hardware_interfaces

radio/1.4/IRadio.hal

+5 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,11 @@ interface IRadio extends @1.3::IRadio {
		* Note this API is the same as IRadio.dial except using the
		* @1.4::EmergencyServiceCategory as the input param.
		*
		* If the number in the 'dialInfo' field is identified as an emergency number in Android,
		* Android use this request for its emergency call instead of @1.0::IRadio.dial. The
		* implementation decides how to handle the call (e.g. emergency routing or normal
		* routing).
		*
		* If the dialed emergency number does not have a specified emergency service category, the
		* 'categories' field is set to @1.4::EmergencyServiceCategory#UNSPECIFIED; iff either the
		* 'categories' field is set to @1.4::EmergencyServiceCategory#UNSPECIFIED or the underlying

radio/1.4/types.hal

+11 −4

Original line number	Diff line number	Diff line
		@@ -52,11 +52,14 @@ enum AccessNetwork : @1.2::AccessNetwork {
		* Emergency number contains information of number, one or more service category(s), mobile country
		* code (mcc), and source(s) that indicate where it comes from.
		*
		* If the source of the emergency number is associated with country, field ‘mcc’ must be
		* provided; otherwise the field ‘mcc’ must be an empty string.
		* If the source of the emergency number is associated with country, field ‘mcc’ must be provided;
		* otherwise the field ‘mcc’ must be an empty string.
		*
		* A unique EmergencyNumber has a unique combination of ‘number’, ‘mcc’ and 'categories' fields.
		* Multiple @1.4::EmergencyNumberSource should be merged into the bitfield for the same
		* If the source of the emergency number is associated with network operator, field ‘mcc’ and
		* 'mnc' must be provided; otherwise the field ‘mnc’ must be an empty string.
		*
		* A unique EmergencyNumber has a unique combination of ‘number’, ‘mcc’, 'mnc' and 'categories'
		* fields. Multiple @1.4::EmergencyNumberSource should be merged into the bitfield for the same
		* EmergencyNumber.
		*
		* Reference: 3GPP TS 22.101 version 9.1.0 Release 9
		@@ -71,6 +74,10 @@ struct EmergencyNumber{
		* 3-digit Mobile Country Code, 0..999. Empty string if not applicable.
		*/
		string mcc;
		/**
		* 2 or 3-digit Mobile Network Code, 0..999. Empty string if not applicable.
		*/
		string mnc;
		/**
		* The bitfield of @1.4::EmergencyServiceCategory(s). See @1.4::EmergencyServiceCategory for
		* the value of each bit.