Merge "Exposing NetworkRegistrationInfo for PS service" am: 3ae8d12fe6 (4e34673c) · Commits · e / os / android_frameworks_base

api/current.txt

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44244,6 +44244,8 @@ package android.telecom {
	package android.telephony {		package android.telephony {

	public final class AccessNetworkConstants {		public final class AccessNetworkConstants {
			field public static final int TRANSPORT_TYPE_WLAN = 2; // 0x2
			field public static final int TRANSPORT_TYPE_WWAN = 1; // 0x1
	}		}

	public static final class AccessNetworkConstants.AccessNetworkType {		public static final class AccessNetworkConstants.AccessNetworkType {
	@@ -44991,6 +44993,35 @@ package android.telephony {
	field @Deprecated public static final int UNKNOWN_RSSI = 99; // 0x63		field @Deprecated public static final int UNKNOWN_RSSI = 99; // 0x63
	}		}

			public final class NetworkRegistrationInfo implements android.os.Parcelable {
			method public int describeContents();
			method public int getAccessNetworkTechnology();
			method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();
			method @Nullable public android.telephony.CellIdentity getCellIdentity();
			method public int getDomain();
			method public int getNrState();
			method public int getTransportType();
			method public boolean isRegistered();
			method public boolean isRoaming();
			method public boolean isSearching();
			method public void writeToParcel(android.os.Parcel, int);
			field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;
			field public static final int DOMAIN_CS = 1; // 0x1
			field public static final int DOMAIN_CS_PS = 3; // 0x3
			field public static final int DOMAIN_PS = 2; // 0x2
			field public static final int DOMAIN_UNKNOWN = 0; // 0x0
			field public static final int NR_STATE_CONNECTED = 3; // 0x3
			field public static final int NR_STATE_NONE = 0; // 0x0
			field public static final int NR_STATE_NOT_RESTRICTED = 2; // 0x2
			field public static final int NR_STATE_RESTRICTED = 1; // 0x1
			field public static final int SERVICE_TYPE_DATA = 2; // 0x2
			field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5
			field public static final int SERVICE_TYPE_SMS = 3; // 0x3
			field public static final int SERVICE_TYPE_UNKNOWN = 0; // 0x0
			field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4
			field public static final int SERVICE_TYPE_VOICE = 1; // 0x1
			}

	public class NetworkScan {		public class NetworkScan {
	method public void stopScan();		method public void stopScan();
	field public static final int ERROR_INTERRUPTED = 10002; // 0x2712		field public static final int ERROR_INTERRUPTED = 10002; // 0x2712
	@@ -45163,6 +45194,7 @@ package android.telephony {
	method public int getChannelNumber();		method public int getChannelNumber();
	method public int getDuplexMode();		method public int getDuplexMode();
	method public boolean getIsManualSelection();		method public boolean getIsManualSelection();
			method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
	method public String getOperatorAlphaLong();		method public String getOperatorAlphaLong();
	method public String getOperatorAlphaShort();		method public String getOperatorAlphaShort();
	method public String getOperatorNumeric();		method public String getOperatorNumeric();

api/system-current.txt

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -8114,8 +8114,6 @@ package android.telephony {

	public final class AccessNetworkConstants {		public final class AccessNetworkConstants {
	field public static final int TRANSPORT_TYPE_INVALID = -1; // 0xffffffff		field public static final int TRANSPORT_TYPE_INVALID = -1; // 0xffffffff
	field public static final int TRANSPORT_TYPE_WLAN = 2; // 0x2
	field public static final int TRANSPORT_TYPE_WWAN = 1; // 0x1
	}		}

	public final class CallAttributes implements android.os.Parcelable {		public final class CallAttributes implements android.os.Parcelable {
	@@ -8743,37 +8741,18 @@ package android.telephony {
	}		}

	public final class NetworkRegistrationInfo implements android.os.Parcelable {		public final class NetworkRegistrationInfo implements android.os.Parcelable {
	method public int describeContents();
	method public int getAccessNetworkTechnology();
	method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();
	method @Nullable public android.telephony.CellIdentity getCellIdentity();
	method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();		method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();
	method public int getDomain();
	method public int getNrState();
	method public int getRegistrationState();		method public int getRegistrationState();
	method public int getRejectCause();		method public int getRejectCause();
	method public int getRoamingType();		method public int getRoamingType();
	method public int getTransportType();
	method public boolean isEmergencyEnabled();		method public boolean isEmergencyEnabled();
	method public boolean isRoaming();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;
	field public static final int DOMAIN_CS = 1; // 0x1
	field public static final int DOMAIN_CS_PS = 3; // 0x3
	field public static final int DOMAIN_PS = 2; // 0x2
	field public static final int DOMAIN_UNKNOWN = 0; // 0x0
	field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3		field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3
	field public static final int REGISTRATION_STATE_HOME = 1; // 0x1		field public static final int REGISTRATION_STATE_HOME = 1; // 0x1
	field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0		field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0
	field public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; // 0x2		field public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; // 0x2
	field public static final int REGISTRATION_STATE_ROAMING = 5; // 0x5		field public static final int REGISTRATION_STATE_ROAMING = 5; // 0x5
	field public static final int REGISTRATION_STATE_UNKNOWN = 4; // 0x4		field public static final int REGISTRATION_STATE_UNKNOWN = 4; // 0x4
	field public static final int SERVICE_TYPE_DATA = 2; // 0x2
	field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5
	field public static final int SERVICE_TYPE_SMS = 3; // 0x3
	field public static final int SERVICE_TYPE_UNKNOWN = 0; // 0x0
	field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4
	field public static final int SERVICE_TYPE_VOICE = 1; // 0x1
	}		}

	public static final class NetworkRegistrationInfo.Builder {		public static final class NetworkRegistrationInfo.Builder {
	@@ -8990,7 +8969,6 @@ package android.telephony {
	method public int getDataNetworkType();		method public int getDataNetworkType();
	method public int getDataRegistrationState();		method public int getDataRegistrationState();
	method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);		method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);
	method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
	method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);
	method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);
	method public int getNrFrequencyRange();		method public int getNrFrequencyRange();

api/test-current.txt

+0 −20

Original line number	Original line	Diff line number	Diff line
	@@ -2888,8 +2888,6 @@ package android.telephony {

	public final class AccessNetworkConstants {		public final class AccessNetworkConstants {
	field public static final int TRANSPORT_TYPE_INVALID = -1; // 0xffffffff		field public static final int TRANSPORT_TYPE_INVALID = -1; // 0xffffffff
	field public static final int TRANSPORT_TYPE_WLAN = 2; // 0x2
	field public static final int TRANSPORT_TYPE_WWAN = 1; // 0x1
	}		}

	public final class CallQuality implements android.os.Parcelable {		public final class CallQuality implements android.os.Parcelable {
	@@ -2952,36 +2950,18 @@ package android.telephony {
	}		}

	public final class NetworkRegistrationInfo implements android.os.Parcelable {		public final class NetworkRegistrationInfo implements android.os.Parcelable {
	method public int describeContents();
	method public int getAccessNetworkTechnology();
	method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();
	method @Nullable public android.telephony.CellIdentity getCellIdentity();
	method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();		method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();
	method public int getDomain();
	method public int getRegistrationState();		method public int getRegistrationState();
	method public int getRejectCause();		method public int getRejectCause();
	method public int getRoamingType();		method public int getRoamingType();
	method public int getTransportType();
	method public boolean isEmergencyEnabled();		method public boolean isEmergencyEnabled();
	method public boolean isRoaming();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;
	field public static final int DOMAIN_CS = 1; // 0x1
	field public static final int DOMAIN_CS_PS = 3; // 0x3
	field public static final int DOMAIN_PS = 2; // 0x2
	field public static final int DOMAIN_UNKNOWN = 0; // 0x0
	field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3		field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3
	field public static final int REGISTRATION_STATE_HOME = 1; // 0x1		field public static final int REGISTRATION_STATE_HOME = 1; // 0x1
	field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0		field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0
	field public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; // 0x2		field public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; // 0x2
	field public static final int REGISTRATION_STATE_ROAMING = 5; // 0x5		field public static final int REGISTRATION_STATE_ROAMING = 5; // 0x5
	field public static final int REGISTRATION_STATE_UNKNOWN = 4; // 0x4		field public static final int REGISTRATION_STATE_UNKNOWN = 4; // 0x4
	field public static final int SERVICE_TYPE_DATA = 2; // 0x2
	field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5
	field public static final int SERVICE_TYPE_SMS = 3; // 0x3
	field public static final int SERVICE_TYPE_UNKNOWN = 0; // 0x0
	field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4
	field public static final int SERVICE_TYPE_VOICE = 1; // 0x1
	}		}

	public static final class NetworkRegistrationInfo.Builder {		public static final class NetworkRegistrationInfo.Builder {

telephony/java/android/telephony/AccessNetworkConstants.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -50,18 +50,12 @@ public final class AccessNetworkConstants {

	/**		/**
	* Transport type for Wireless Wide Area Networks (i.e. Cellular)		* Transport type for Wireless Wide Area Networks (i.e. Cellular)
	* @hide
	*/		*/
	@SystemApi
	@TestApi
	public static final int TRANSPORT_TYPE_WWAN = 1;		public static final int TRANSPORT_TYPE_WWAN = 1;

	/**		/**
	* Transport type for Wireless Local Area Networks (i.e. Wifi)		* Transport type for Wireless Local Area Networks (i.e. Wifi)
	* @hide
	*/		*/
	@SystemApi
	@TestApi
	public static final int TRANSPORT_TYPE_WLAN = 2;		public static final int TRANSPORT_TYPE_WLAN = 2;

	/** @hide */		/** @hide */

telephony/java/android/telephony/NetworkRegistrationInfo.java

+90 −25

Original line number	Original line	Diff line number	Diff line
	@@ -36,10 +36,7 @@ import java.util.stream.Collectors;

	/**		/**
	* Description of a mobile network registration info		* Description of a mobile network registration info
	* @hide
	*/		*/
	@SystemApi
	@TestApi
	public final class NetworkRegistrationInfo implements Parcelable {		public final class NetworkRegistrationInfo implements Parcelable {
	/**		/**
	* Network domain		* Network domain
	@@ -51,9 +48,9 @@ public final class NetworkRegistrationInfo implements Parcelable {

	/** Unknown / Unspecified domain */		/** Unknown / Unspecified domain */
	public static final int DOMAIN_UNKNOWN = 0;		public static final int DOMAIN_UNKNOWN = 0;
	/** Circuit switching domain */		/** Circuit switched domain */
	public static final int DOMAIN_CS = android.hardware.radio.V1_5.Domain.CS;		public static final int DOMAIN_CS = android.hardware.radio.V1_5.Domain.CS;
	/** Packet switching domain */		/** Packet switched domain */
	public static final int DOMAIN_PS = android.hardware.radio.V1_5.Domain.PS;		public static final int DOMAIN_PS = android.hardware.radio.V1_5.Domain.PS;
	/** Applicable to both CS and PS Domain */		/** Applicable to both CS and PS Domain */
	public static final int DOMAIN_CS_PS = DOMAIN_CS \| DOMAIN_PS;		public static final int DOMAIN_CS_PS = DOMAIN_CS \| DOMAIN_PS;
	@@ -69,17 +66,41 @@ public final class NetworkRegistrationInfo implements Parcelable {
	REGISTRATION_STATE_UNKNOWN, REGISTRATION_STATE_ROAMING})		REGISTRATION_STATE_UNKNOWN, REGISTRATION_STATE_ROAMING})
	public @interface RegistrationState {}		public @interface RegistrationState {}

	/** Not registered. The device is not currently searching a new operator to register. */		/**
			* Not registered. The device is not currently searching a new operator to register.
			* @hide
			*/
			@SystemApi @TestApi
	public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0;		public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0;
	/** Registered on home network. */		/**
			* Registered on home network.
			* @hide
			*/
			@SystemApi @TestApi
	public static final int REGISTRATION_STATE_HOME = 1;		public static final int REGISTRATION_STATE_HOME = 1;
	/** Not registered. The device is currently searching a new operator to register. */		/**
			* Not registered. The device is currently searching a new operator to register.
			* @hide
			*/
			@SystemApi @TestApi
	public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2;		public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2;
	/** Registration denied. */		/**
			* Registration denied.
			* @hide
			*/
			@SystemApi @TestApi
	public static final int REGISTRATION_STATE_DENIED = 3;		public static final int REGISTRATION_STATE_DENIED = 3;
	/** Registration state is unknown. */		/**
			* Registration state is unknown.
			* @hide
			*/
			@SystemApi @TestApi
	public static final int REGISTRATION_STATE_UNKNOWN = 4;		public static final int REGISTRATION_STATE_UNKNOWN = 4;
	/** Registered on roaming network. */		/**
			* Registered on roaming network.
			* @hide
			*/
			@SystemApi @TestApi
	public static final int REGISTRATION_STATE_ROAMING = 5;		public static final int REGISTRATION_STATE_ROAMING = 5;

	/** @hide */		/** @hide */
	@@ -92,7 +113,6 @@ public final class NetworkRegistrationInfo implements Parcelable {
	/**		/**
	* The device isn't camped on an LTE cell or the LTE cell doesn't support E-UTRA-NR		* The device isn't camped on an LTE cell or the LTE cell doesn't support E-UTRA-NR
	* Dual Connectivity(EN-DC).		* Dual Connectivity(EN-DC).
	* @hide
	*/		*/
	public static final int NR_STATE_NONE = 0;		public static final int NR_STATE_NONE = 0;

	@@ -100,7 +120,6 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) but		* The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) but
	* either the use of dual connectivity with NR(DCNR) is restricted or NR is not supported by		* either the use of dual connectivity with NR(DCNR) is restricted or NR is not supported by
	* the selected PLMN.		* the selected PLMN.
	* @hide
	*/		*/
	public static final int NR_STATE_RESTRICTED = 1;		public static final int NR_STATE_RESTRICTED = 1;

	@@ -108,14 +127,12 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) and both		* The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) and both
	* the use of dual connectivity with NR(DCNR) is not restricted and NR is supported by the		* the use of dual connectivity with NR(DCNR) is not restricted and NR is supported by the
	* selected PLMN.		* selected PLMN.
	* @hide
	*/		*/
	public static final int NR_STATE_NOT_RESTRICTED = 2;		public static final int NR_STATE_NOT_RESTRICTED = 2;

	/**		/**
	* The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) and		* The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) and
	* also connected to at least one 5G cell as a secondary serving cell.		* also connected to at least one 5G cell as a secondary serving cell.
	* @hide
	*/		*/
	public static final int NR_STATE_CONNECTED = 3;		public static final int NR_STATE_CONNECTED = 3;

	@@ -129,22 +146,34 @@ public final class NetworkRegistrationInfo implements Parcelable {
	SERVICE_TYPE_VIDEO, SERVICE_TYPE_EMERGENCY})		SERVICE_TYPE_VIDEO, SERVICE_TYPE_EMERGENCY})
	public @interface ServiceType {}		public @interface ServiceType {}

	/** Unkown service */		/**
			* Unknown service
			*/
	public static final int SERVICE_TYPE_UNKNOWN = 0;		public static final int SERVICE_TYPE_UNKNOWN = 0;

	/** Voice service */		/**
			* Voice service
			*/
	public static final int SERVICE_TYPE_VOICE = 1;		public static final int SERVICE_TYPE_VOICE = 1;

	/** Data service */		/**
			* Data service
			*/
	public static final int SERVICE_TYPE_DATA = 2;		public static final int SERVICE_TYPE_DATA = 2;

	/** SMS service */		/**
			* SMS service
			*/
	public static final int SERVICE_TYPE_SMS = 3;		public static final int SERVICE_TYPE_SMS = 3;

	/** Video service */		/**
			* Video service
			*/
	public static final int SERVICE_TYPE_VIDEO = 4;		public static final int SERVICE_TYPE_VIDEO = 4;

	/** Emergency service */		/**
			* Emergency service
			*/
	public static final int SERVICE_TYPE_EMERGENCY = 5;		public static final int SERVICE_TYPE_EMERGENCY = 5;

	@Domain		@Domain
	@@ -330,9 +359,7 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* Get the 5G NR connection state.		* Get the 5G NR connection state.
	*		*
	* @return the 5G NR connection state.		* @return the 5G NR connection state.
	* @hide
	*/		*/
	@SystemApi
	public @NRState int getNrState() {		public @NRState int getNrState() {
	return mNrState;		return mNrState;
	}		}
	@@ -344,11 +371,29 @@ public final class NetworkRegistrationInfo implements Parcelable {

	/**		/**
	* @return The registration state.		* @return The registration state.
			*
			* @hide
	*/		*/
			@SystemApi @TestApi
	public @RegistrationState int getRegistrationState() {		public @RegistrationState int getRegistrationState() {
	return mRegistrationState;		return mRegistrationState;
	}		}

			/**
			* @return {@code true} if registered on roaming network, {@code false} otherwise.
			*/
			public boolean isRegistered() {
			return mRegistrationState == REGISTRATION_STATE_HOME
			\|\| mRegistrationState == REGISTRATION_STATE_ROAMING;
			}

			/**
			* @return {@code true} if registered on roaming network, {@code false} otherwise.
			*/
			public boolean isSearching() {
			return mRegistrationState == REGISTRATION_STATE_NOT_REGISTERED_SEARCHING;
			}

	/**		/**
	* @return {@code true} if registered on roaming network, {@code false} otherwise.		* @return {@code true} if registered on roaming network, {@code false} otherwise.
	*/		*/
	@@ -376,15 +421,18 @@ public final class NetworkRegistrationInfo implements Parcelable {

	/**		/**
	* @return the current network roaming type.		* @return the current network roaming type.
			* @hide
	*/		*/
			@SystemApi @TestApi
	public @ServiceState.RoamingType int getRoamingType() {		public @ServiceState.RoamingType int getRoamingType() {
	return mRoamingType;		return mRoamingType;
	}		}

	/**		/**
	* @return Whether emergency is enabled.		* @return Whether emergency is enabled.
			* @hide
	*/		*/
			@SystemApi @TestApi
	public boolean isEmergencyEnabled() { return mEmergencyOnly; }		public boolean isEmergencyEnabled() { return mEmergencyOnly; }

	/**		/**
	@@ -422,7 +470,9 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* @return Reason for denial if the registration state is {@link #REGISTRATION_STATE_DENIED}.		* @return Reason for denial if the registration state is {@link #REGISTRATION_STATE_DENIED}.
	* Depending on {@code accessNetworkTechnology}, the values are defined in 3GPP TS 24.008		* Depending on {@code accessNetworkTechnology}, the values are defined in 3GPP TS 24.008
	* 10.5.3.6 for UMTS, 3GPP TS 24.301 9.9.3.9 for LTE, and 3GPP2 A.S0001 6.2.2.44 for CDMA		* 10.5.3.6 for UMTS, 3GPP TS 24.301 9.9.3.9 for LTE, and 3GPP2 A.S0001 6.2.2.44 for CDMA
			* @hide
	*/		*/
			@SystemApi @TestApi
	public int getRejectCause() {		public int getRejectCause() {
	return mRejectCause;		return mRejectCause;
	}		}
	@@ -445,8 +495,10 @@ public final class NetworkRegistrationInfo implements Parcelable {

	/**		/**
	* @return Data registration related info		* @return Data registration related info
			* @hide
	*/		*/
	@Nullable		@Nullable
			@SystemApi @TestApi
	public DataSpecificRegistrationInfo getDataSpecificInfo() {		public DataSpecificRegistrationInfo getDataSpecificInfo() {
	return mDataSpecificInfo;		return mDataSpecificInfo;
	}		}
	@@ -571,7 +623,11 @@ public final class NetworkRegistrationInfo implements Parcelable {
	&& mNrState == other.mNrState;		&& mNrState == other.mNrState;
	}		}

			/**
			* @hide
			*/
	@Override		@Override
			@SystemApi @TestApi
	public void writeToParcel(Parcel dest, int flags) {		public void writeToParcel(Parcel dest, int flags) {
	dest.writeInt(mDomain);		dest.writeInt(mDomain);
	dest.writeInt(mTransportType);		dest.writeInt(mTransportType);
	@@ -659,7 +715,9 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* .setRegistrationState(REGISTRATION_STATE_HOME)		* .setRegistrationState(REGISTRATION_STATE_HOME)
	* .build();		* .build();
	* </code></pre>		* </code></pre>
			* @hide
	*/		*/
			@SystemApi @TestApi
	public static final class Builder {		public static final class Builder {
	@Domain		@Domain
	private int mDomain;		private int mDomain;
	@@ -759,7 +817,9 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* @param emergencyOnly True if this network registration is for emergency use only.		* @param emergencyOnly True if this network registration is for emergency use only.
	*		*
	* @return The same instance of the builder.		* @return The same instance of the builder.
			* @hide
	*/		*/
			@SystemApi @TestApi
	public @NonNull Builder setEmergencyOnly(boolean emergencyOnly) {		public @NonNull Builder setEmergencyOnly(boolean emergencyOnly) {
	mEmergencyOnly = emergencyOnly;		mEmergencyOnly = emergencyOnly;
	return this;		return this;
	@@ -771,7 +831,9 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* @param availableServices Available services.		* @param availableServices Available services.
	*		*
	* @return The same instance of the builder.		* @return The same instance of the builder.
			* @hide
	*/		*/
			@SystemApi @TestApi
	public @NonNull Builder setAvailableServices(		public @NonNull Builder setAvailableServices(
	@NonNull @ServiceType List<Integer> availableServices) {		@NonNull @ServiceType List<Integer> availableServices) {
	mAvailableServices = availableServices;		mAvailableServices = availableServices;
	@@ -784,7 +846,9 @@ public final class NetworkRegistrationInfo implements Parcelable {
	* @param cellIdentity The cell identity.		* @param cellIdentity The cell identity.
	*		*
	* @return The same instance of the builder.		* @return The same instance of the builder.
			* @hide
	*/		*/
			@SystemApi @TestApi
	public @NonNull Builder setCellIdentity(@Nullable CellIdentity cellIdentity) {		public @NonNull Builder setCellIdentity(@Nullable CellIdentity cellIdentity) {
	mCellIdentity = cellIdentity;		mCellIdentity = cellIdentity;
	return this;		return this;
	@@ -792,9 +856,10 @@ public final class NetworkRegistrationInfo implements Parcelable {

	/**		/**
	* Build the NetworkRegistrationInfo.		* Build the NetworkRegistrationInfo.
	*
	* @return the NetworkRegistrationInfo object.		* @return the NetworkRegistrationInfo object.
			* @hide
	*/		*/
			@SystemApi @TestApi
	public @NonNull NetworkRegistrationInfo build() {		public @NonNull NetworkRegistrationInfo build() {
	return new NetworkRegistrationInfo(mDomain, mTransportType, mRegistrationState,		return new NetworkRegistrationInfo(mDomain, mTransportType, mRegistrationState,
	mAccessNetworkTechnology, mRejectCause, mEmergencyOnly, mAvailableServices,		mAccessNetworkTechnology, mRejectCause, mEmergencyOnly, mAvailableServices,