Merge "Cleaned up the flag apn_setting_field_support_flag" into main (b1d4e2ef) · Commits · e / os / android_frameworks_base

core/api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -38774,7 +38774,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 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";
		@@ -38788,8 +38788,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 public static final String MTU_V4 = "mtu_v4";
		field 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";
		@@ -38805,8 +38805,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";
		field public static final String USER_EDITABLE = "user_editable";
		field public static final String USER_VISIBLE = "user_visible";
		}

		public static final class Telephony.Mms implements android.provider.Telephony.BaseMmsColumns {
		@@ -47776,7 +47776,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 isAlwaysOn();
		method public boolean isEnabled();
		method public boolean isPersistent();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -47818,7 +47818,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 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/java/android/provider/Telephony.java

+0 −7

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

		import android.Manifest;
		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		@@ -50,7 +49,6 @@ 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;
		@@ -3196,7 +3194,6 @@ public final class Telephony {
		* See 3GPP TS 23.501 section 5.6.13
		* <P>Type: INTEGER</P>
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String ALWAYS_ON = "always_on";

		/**
		@@ -3307,7 +3304,6 @@ public final class Telephony {
		* connected, in bytes.
		* <p>Type: INTEGER </p>
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String MTU_V4 = "mtu_v4";

		/**
		@@ -3315,7 +3311,6 @@ public final class Telephony {
		* connected, in bytes.
		* <p>Type: INTEGER </p>
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String MTU_V6 = "mtu_v6";

		/**
		@@ -3338,14 +3333,12 @@ public final class Telephony {
		* {@code true} if this APN visible to the user, {@code false} otherwise.
		* <p>Type: INTEGER (boolean)</p>
		*/
		@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>
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public static final String USER_EDITABLE = "user_editable";

		/**

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -994,7 +994,6 @@ public class ApnSetting implements Parcelable {
		*
		* @return True if the PDU session for this APN should always be on and false otherwise
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public boolean isAlwaysOn() {
		return mAlwaysOn;
		}
		@@ -2349,7 +2348,6 @@ public class ApnSetting implements Parcelable {
		*
		* @param alwaysOn the always on status to set for this APN
		*/
		@FlaggedApi(Flags.FLAG_APN_SETTING_FIELD_SUPPORT_FLAG)
		public @NonNull Builder setAlwaysOn(boolean alwaysOn) {
		this.mAlwaysOn = alwaysOn;
		return this;