Merge "Expose Apn Setting Field api's" into main (f5eae914) · Commits · e / os / android_frameworks_base

core/api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -37288,6 +37288,7 @@ package android.provider {
		}

		public static final class Telephony.Carriers implements android.provider.BaseColumns {
		field @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") public static final String ALWAYS_ON = "always_on";
		field public static final String APN = "apn";
		field public static final String AUTH_TYPE = "authtype";
		field @Deprecated public static final String BEARER = "bearer";
		@@ -37301,6 +37302,8 @@ package android.provider {
		field public static final String MMSPORT = "mmsport";
		field public static final String MMSPROXY = "mmsproxy";
		field @Deprecated public static final String MNC = "mnc";
		field @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") public static final String MTU_V4 = "mtu_v4";
		field @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") public static final String MTU_V6 = "mtu_v6";
		field @Deprecated public static final String MVNO_MATCH_DATA = "mvno_match_data";
		field @Deprecated public static final String MVNO_TYPE = "mvno_type";
		field public static final String NAME = "name";
		@@ -37316,6 +37319,8 @@ package android.provider {
		field public static final String SUBSCRIPTION_ID = "sub_id";
		field public static final String TYPE = "type";
		field public static final String USER = "user";
		field @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") public static final String USER_EDITABLE = "user_editable";
		field @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") public static final String USER_VISIBLE = "user_visible";
		}

		public static final class Telephony.Mms implements android.provider.Telephony.BaseMmsColumns {
		@@ -45832,6 +45837,7 @@ package android.telephony.data {
		method public int getProxyPort();
		method public int getRoamingProtocol();
		method public String getUser();
		method @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") public boolean isAlwaysOn();
		method public boolean isEnabled();
		method public boolean isPersistent();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -45871,6 +45877,7 @@ package android.telephony.data {
		public static class ApnSetting.Builder {
		ctor public ApnSetting.Builder();
		method public android.telephony.data.ApnSetting build();
		method @FlaggedApi("com.android.internal.telephony.flags.apn_setting_field_support_flag") @NonNull public android.telephony.data.ApnSetting.Builder setAlwaysOn(boolean);
		method @NonNull public android.telephony.data.ApnSetting.Builder setApnName(@Nullable String);
		method @NonNull public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int);
		method @NonNull public android.telephony.data.ApnSetting.Builder setAuthType(int);

core/api/system-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -11234,15 +11234,11 @@ package android.provider {
		field public static final String MAX_CONNECTIONS = "max_conns";
		field public static final String MODEM_PERSIST = "modem_cognitive";
		field @Deprecated public static final String MTU = "mtu";
		field public static final String MTU_V4 = "mtu_v4";
		field public static final String MTU_V6 = "mtu_v6";
		field public static final int NO_APN_SET_ID = 0; // 0x0
		field public static final String TIME_LIMIT_FOR_MAX_CONNECTIONS = "max_conns_time";
		field public static final int UNEDITED = 0; // 0x0
		field public static final int USER_DELETED = 2; // 0x2
		field public static final String USER_EDITABLE = "user_editable";
		field public static final int USER_EDITED = 1; // 0x1
		field public static final String USER_VISIBLE = "user_visible";
		field public static final String WAIT_TIME_RETRY = "wait_time";
		}

core/java/android/provider/Telephony.java

+7 −9

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.provider;

		import android.Manifest;
		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		@@ -49,6 +50,7 @@ import android.text.TextUtils;
		import android.util.Patterns;

		import com.android.internal.telephony.SmsApplication;
		import com.android.internal.telephony.flags.Flags;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -3191,8 +3193,8 @@ public final class Telephony {
		* Sets whether the PDU session brought up by this APN should always be on.
		* See 3GPP TS 23.501 section 5.6.13
		* <P>Type: INTEGER</P>
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String ALWAYS_ON = "always_on";

		/**
		@@ -3302,18 +3304,16 @@ public final class Telephony {
		* The MTU (maximum transmit unit) size of the mobile interface for IPv4 to which the APN is
		* connected, in bytes.
		* <p>Type: INTEGER </p>
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String MTU_V4 = "mtu_v4";

		/**
		* The MTU (maximum transmit unit) size of the mobile interface for IPv6 to which the APN is
		* connected, in bytes.
		* <p>Type: INTEGER </p>
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String MTU_V6 = "mtu_v6";

		/**
		@@ -3335,17 +3335,15 @@ public final class Telephony {
		/**
		* {@code true} if this APN visible to the user, {@code false} otherwise.
		* <p>Type: INTEGER (boolean)</p>
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String USER_VISIBLE = "user_visible";

		/**
		* {@code true} if the user allowed to edit this APN, {@code false} otherwise.
		* <p>Type: INTEGER (boolean)</p>
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String USER_EDITABLE = "user_editable";

		/**

telephony/java/android/telephony/data/ApnSetting.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -951,8 +951,8 @@ public class ApnSetting implements Parcelable {
		* See 3GPP TS 23.501 section 5.6.13
		*
		* @return True if the PDU session for this APN should always be on and false otherwise
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public boolean isAlwaysOn() {
		return mAlwaysOn;
		}
		@@ -2282,9 +2282,9 @@ public class ApnSetting implements Parcelable {
		* See 3GPP TS 23.501 section 5.6.13
		*
		* @param alwaysOn the always on status to set for this APN
		* @hide
		*/
		public Builder setAlwaysOn(boolean alwaysOn) {
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public @NonNull Builder setAlwaysOn(boolean alwaysOn) {
		this.mAlwaysOn = alwaysOn;
		return this;
		}