Merge "Make PreciseDataConnectionState constructor System API" (a6622894) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8878,6 +8878,7 @@ package android.telephony {
		}

		public final class PreciseDataConnectionState implements android.os.Parcelable {
		ctor public PreciseDataConnectionState(int, int, int, @NonNull String, @Nullable android.net.LinkProperties, int, @Nullable android.telephony.data.ApnSetting);
		method @Deprecated @NonNull public String getDataConnectionApn();
		method @Deprecated public int getDataConnectionApnTypeBitMask();
		method @Deprecated public int getDataConnectionFailCause();

+2 −2

Original line number	Diff line number	Diff line
		@@ -1596,7 +1596,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		TelephonyManager.DATA_UNKNOWN,
		TelephonyManager.NETWORK_TYPE_UNKNOWN,
		ApnSetting.getApnTypesBitmaskFromString(apnType), null, null,
		DataFailCause.NONE));
		DataFailCause.NONE, null));
		for (Record r : mRecords) {
		if (r.matchPhoneStateListenerEvent(
		PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE)
		@@ -1781,7 +1781,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		TelephonyManager.DATA_UNKNOWN,
		TelephonyManager.NETWORK_TYPE_UNKNOWN,
		ApnSetting.getApnTypesBitmaskFromString(apnType), null, null,
		failCause));
		failCause, null));
		for (Record r : mRecords) {
		if (r.matchPhoneStateListenerEvent(
		PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE)

+5 −3

Original line number	Diff line number	Diff line
		@@ -81,18 +81,20 @@ public final class PreciseDataConnectionState implements Parcelable {


		/**
		* Constructor
		* Constructor of PreciseDataConnectionState
		*
		* @param state the state of the data connection
		* @param networkType the access network that is/would carry this data connection
		* @param apnTypes the APN types that this data connection carries
		* @param apnSetting if there is a valid APN for this Data Connection, then the APN Settings;
		* if there is no valid APN setting for the specific type, then this will be null
		* @param apn the APN of this data connection
		* @param linkProperties if the data connection is connected, the properties of the connection
		* @param failCause in case a procedure related to this data connection fails, a non-zero error
		* code indicating the cause of the failure.
		* @param apnSetting if there is a valid APN for this Data Connection, then the APN Settings;
		* if there is no valid APN setting for the specific type, then this will be null
		* @hide
		*/
		@SystemApi
		public PreciseDataConnectionState(@DataState int state,
		@NetworkType int networkType,
		@ApnType int apnTypes, @NonNull String apn,