Merge "Expose DataSpecificRegistrationState as System API" am: d5386dfe1f am: e212a01efe (6cde0385) · Commits · e / os / android_frameworks_base

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -7472,6 +7472,13 @@ package android.telephony {
		field public static final int VSNCP_TIMEOUT = 2236; // 0x8bc
		}

		public final class DataSpecificRegistrationStates implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationStates> CREATOR;
		}

		public final class DisconnectCause {
		field public static final int ALREADY_DIALING = 72; // 0x48
		field public static final int ANSWERED_ELSEWHERE = 52; // 0x34
		@@ -7580,6 +7587,7 @@ package android.telephony {
		method public int getAccessNetworkTechnology();
		method public int[] getAvailableServices();
		method public android.telephony.CellIdentity getCellIdentity();
		method @Nullable public android.telephony.DataSpecificRegistrationStates getDataSpecificStates();
		method public int getDomain();
		method public int getRegState();
		method public int getRejectCause();

telephony/java/android/telephony/DataSpecificRegistrationStates.java

+20 −3

Original line number	Diff line number	Diff line
		package android.telephony;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -10,14 +12,17 @@ import java.util.Objects;
		* Class that stores information specific to data network registration.
		* @hide
		*/
		public class DataSpecificRegistrationStates implements Parcelable{
		@SystemApi
		public final class DataSpecificRegistrationStates implements Parcelable{
		/**
		* @hide
		* The maximum number of simultaneous Data Calls that
		* must be established using setupDataCall().
		*/
		public final int maxDataCalls;

		/**
		* @hide
		* Indicates if the use of dual connectivity with NR is restricted.
		* Reference: 3GPP TS 24.301 v15.03 section 9.3.3.12A.
		*/
		@@ -25,7 +30,7 @@ public class DataSpecificRegistrationStates implements Parcelable{

		/**
		* Indicates if NR is supported by the selected PLMN.
		*
		* @hide
		* {@code true} if the bit N is in the PLMN-InfoList-r15 is true and the selected PLMN is
		* present in plmn-IdentityList at position N.
		* Reference: 3GPP TS 36.331 v15.2.2 section 6.3.1 PLMN-InfoList-r15.
		@@ -34,6 +39,7 @@ public class DataSpecificRegistrationStates implements Parcelable{
		public final boolean isNrAvailable;

		/**
		* @hide
		* Indicates that if E-UTRA-NR Dual Connectivity (EN-DC) is supported by the primary serving
		* cell.
		*
		@@ -47,8 +53,11 @@ public class DataSpecificRegistrationStates implements Parcelable{
		/**
		* Provides network support info for LTE VoPS and LTE Emergency bearer support
		*/
		public final LteVopsSupportInfo lteVopsSupportInfo;
		private final LteVopsSupportInfo lteVopsSupportInfo;

		/**
		* @hide
		*/
		DataSpecificRegistrationStates(
		int maxDataCalls, boolean isDcNrRestricted, boolean isNrAvailable,
		boolean isEnDcAvailable, LteVopsSupportInfo lteVops) {
		@@ -126,4 +135,12 @@ public class DataSpecificRegistrationStates implements Parcelable{
		return new DataSpecificRegistrationStates[size];
		}
		};

		/**
		* @return LteVopsSupportInfo
		*/
		@NonNull
		public LteVopsSupportInfo getLteVopsSupportInfo() {
		return lteVopsSupportInfo;
		}
		}

telephony/java/android/telephony/NetworkRegistrationState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ public class NetworkRegistrationState implements Parcelable {
		}

		/**
		* @hide
		* @return Data registration related info
		*/
		@Nullable
		public DataSpecificRegistrationStates getDataSpecificStates() {