Merge "Telephony data refactoring API changes" (f6a69729) · Commits · e / os / android_frameworks_base

core/api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -41762,6 +41762,7 @@ package android.telephony {
		field public static final int DATA_ENABLED_REASON_POLICY = 1; // 0x1
		field public static final int DATA_ENABLED_REASON_THERMAL = 3; // 0x3
		field public static final int DATA_ENABLED_REASON_USER = 0; // 0x0
		field public static final int DATA_HANDOVER_IN_PROGRESS = 5; // 0x5
		field public static final int DATA_SUSPENDED = 3; // 0x3
		field public static final int DATA_UNKNOWN = -1; // 0xffffffff
		field public static final int ERI_FLASH = 2; // 0x2
		@@ -42030,6 +42031,8 @@ package android.telephony.data {
		method public String getMmsProxyAddressAsString();
		method public int getMmsProxyPort();
		method public android.net.Uri getMmsc();
		method public int getMtuV4();
		method public int getMtuV6();
		method public int getMvnoType();
		method public int getNetworkTypeBitmask();
		method public String getOperatorNumeric();
		@@ -42086,10 +42089,14 @@ package android.telephony.data {
		method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(@Nullable String);
		method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyPort(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setMmsc(@Nullable android.net.Uri);
		method @NonNull public android.telephony.data.ApnSetting.Builder setMtuV4(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setMtuV6(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setMvnoType(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setNetworkTypeBitmask(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setOperatorNumeric(@Nullable String);
		method @NonNull public android.telephony.data.ApnSetting.Builder setPassword(@Nullable String);
		method @NonNull public android.telephony.data.ApnSetting.Builder setPersistent(boolean);
		method @NonNull public android.telephony.data.ApnSetting.Builder setProfileId(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setProtocol(int);
		method @Deprecated public android.telephony.data.ApnSetting.Builder setProxyAddress(java.net.InetAddress);
		method @NonNull public android.telephony.data.ApnSetting.Builder setProxyAddress(@Nullable String);

core/api/system-current.txt

+28 −24

Original line number	Diff line number	Diff line
		@@ -12070,21 +12070,23 @@ package android.telephony.data {

		public final class DataProfile implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getApn();
		method public int getAuthType();
		method public int getBearerBitmask();
		method @Deprecated @NonNull public String getApn();
		method @Nullable public android.telephony.data.ApnSetting getApnSetting();
		method @Deprecated public int getAuthType();
		method @Deprecated public int getBearerBitmask();
		method @Deprecated public int getMtu();
		method public int getMtuV4();
		method public int getMtuV6();
		method @Nullable public String getPassword();
		method public int getProfileId();
		method public int getProtocolType();
		method public int getRoamingProtocolType();
		method public int getSupportedApnTypesBitmask();
		method @Deprecated public int getMtuV4();
		method @Deprecated public int getMtuV6();
		method @Deprecated @Nullable public String getPassword();
		method @Deprecated public int getProfileId();
		method @Deprecated public int getProtocolType();
		method @Deprecated public int getRoamingProtocolType();
		method @Deprecated public int getSupportedApnTypesBitmask();
		method @Nullable public android.telephony.data.TrafficDescriptor getTrafficDescriptor();
		method public int getType();
		method @Nullable public String getUserName();
		method @Deprecated @Nullable public String getUserName();
		method public boolean isEnabled();
		method public boolean isPersistent();
		method @Deprecated public boolean isPersistent();
		method public boolean isPreferred();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.DataProfile> CREATOR;
		@@ -12097,21 +12099,23 @@ package android.telephony.data {
		ctor public DataProfile.Builder();
		method @NonNull public android.telephony.data.DataProfile build();
		method @NonNull public android.telephony.data.DataProfile.Builder enable(boolean);
		method @NonNull public android.telephony.data.DataProfile.Builder setApn(@NonNull String);
		method @NonNull public android.telephony.data.DataProfile.Builder setAuthType(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setBearerBitmask(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setApn(@NonNull String);
		method @NonNull public android.telephony.data.DataProfile.Builder setApnSetting(@NonNull android.telephony.data.ApnSetting);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setAuthType(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setBearerBitmask(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setMtu(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setMtuV4(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setMtuV6(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setPassword(@NonNull String);
		method @NonNull public android.telephony.data.DataProfile.Builder setPersistent(boolean);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setMtuV4(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setMtuV6(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setPassword(@NonNull String);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setPersistent(boolean);
		method @NonNull public android.telephony.data.DataProfile.Builder setPreferred(boolean);
		method @NonNull public android.telephony.data.DataProfile.Builder setProfileId(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setProtocolType(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setRoamingProtocolType(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setSupportedApnTypesBitmask(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setProfileId(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setProtocolType(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setRoamingProtocolType(int);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setSupportedApnTypesBitmask(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setTrafficDescriptor(@NonNull android.telephony.data.TrafficDescriptor);
		method @NonNull public android.telephony.data.DataProfile.Builder setType(int);
		method @NonNull public android.telephony.data.DataProfile.Builder setUserName(@NonNull String);
		method @Deprecated @NonNull public android.telephony.data.DataProfile.Builder setUserName(@NonNull String);
		}

		public abstract class DataService extends android.app.Service {

core/java/android/telephony/PhoneStateListener.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,7 @@ public class PhoneStateListener {
		* @see TelephonyManager#DATA_CONNECTING
		* @see TelephonyManager#DATA_CONNECTED
		* @see TelephonyManager#DATA_SUSPENDED
		* @see TelephonyManager#DATA_HANDOVER_IN_PROGRESS
		* @deprecated Use {@link TelephonyCallback.DataConnectionStateListener} instead.
		*/
		@Deprecated

core/java/android/telephony/TelephonyCallback.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -792,6 +792,7 @@ public class TelephonyCallback {
		* @see TelephonyManager#DATA_CONNECTING
		* @see TelephonyManager#DATA_CONNECTED
		* @see TelephonyManager#DATA_SUSPENDED
		* @see TelephonyManager#DATA_HANDOVER_IN_PROGRESS
		*/
		void onDataConnectionStateChanged(@TelephonyManager.DataState int state,
		@Annotation.NetworkType int networkType);

telephony/java/android/telephony/TelephonyManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -5985,6 +5985,7 @@ public class TelephonyManager {
		DATA_CONNECTED,
		DATA_SUSPENDED,
		DATA_DISCONNECTING,
		DATA_HANDOVER_IN_PROGRESS,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface DataState{}
		@@ -6008,6 +6009,12 @@ public class TelephonyManager {
		*/
		public static final int DATA_DISCONNECTING = 4;

		/**
		* Data connection state: Handover in progress. The connection is being transited from cellular
		* network to IWLAN, or from IWLAN to cellular network.
		*/
		public static final int DATA_HANDOVER_IN_PROGRESS = 5;

		/**
		* Used for checking if the SDK version for {@link TelephonyManager#getDataState} is above Q.
		*/
		@@ -6024,6 +6031,7 @@ public class TelephonyManager {
		* @see #DATA_CONNECTED
		* @see #DATA_SUSPENDED
		* @see #DATA_DISCONNECTING
		* @see #DATA_HANDOVER_IN_PROGRESS
		*/
		public int getDataState() {
		try {