Type: INTEGER
*@hide */ @SystemApi - public static final String MAX_CONNS = "max_conns"; + public static final String MAX_CONNECTIONS = "max_conns"; /** - * The wait time for retry of the APN. + * The wait time for retrying the APN, in milliseconds. *Type: INTEGER
*@hide */ @SystemApi - public static final String WAIT_TIME = "wait_time"; + public static final String WAIT_TIME_RETRY = "wait_time"; /** - * The time to limit max connection for the APN. + * The max number of seconds this APN will support its maximum number of connections + * as defined in {@link #MAX_CONNECTIONS}. *Type: INTEGER
*@hide */ @SystemApi - public static final String MAX_CONNS_TIME = "max_conns_time"; + public static final String TIME_LIMIT_FOR_MAX_CONNECTIONS = "max_conns_time"; /** - * The MTU(Maxinum transmit unit) size of the mobile interface to which the APN connected. + * The MTU (maximum transmit unit) size of the mobile interface to which the APN is + * connected, in bytes. *Type: INTEGER
* @hide */ @@ -2934,11 +2939,19 @@ public final class Telephony { /** * APN edit status. APN could be added/edited/deleted by a user or carrier. + * see all possible returned APN edit status. + *Type: INTEGER
* @hide */ @SystemApi - public static final String EDITED = "edited"; + public static final String EDITED_STATUS = "edited"; /** * {@code true} if this APN visible to the user, {@code false} otherwise. @@ -2957,59 +2970,61 @@ public final class Telephony { public static final String USER_EDITABLE = "user_editable"; /** - * {@link #EDITED APN edit status} indicates that this APN has not been edited or fails to - * edit. + * {@link #EDITED_STATUS APN edit status} indicates that this APN has not been edited or + * fails to edit. *Type: INTEGER
* @hide */ @SystemApi - public static final int UNEDITED = 0; + public static final @EditStatus int UNEDITED = 0; /** - * {@link #EDITED APN edit status} indicates that this APN has been edited by users. + * {@link #EDITED_STATUS APN edit status} indicates that this APN has been edited by users. *Type: INTEGER
* @hide */ @SystemApi - public static final int USER_EDITED = 1; + public static final @EditStatus int USER_EDITED = 1; /** - * {@link #EDITED APN edit status} indicates that this APN has been deleted by users. + * {@link #EDITED_STATUS APN edit status} indicates that this APN has been deleted by users. *Type: INTEGER
* @hide */ @SystemApi - public static final int USER_DELETED = 2; + public static final @EditStatus int USER_DELETED = 2; /** - * {@link #EDITED APN edit status} is an intermediate value used to indicate that an entry - * deleted by the user is still present in the new APN database and therefore must remain - * tagged as user deleted rather than completely removed from the database. + * {@link #EDITED_STATUS APN edit status} is an intermediate value used to indicate that an + * entry deleted by the user is still present in the new APN database and therefore must + * remain tagged as user deleted rather than completely removed from the database. * @hide */ public static final int USER_DELETED_BUT_PRESENT_IN_XML = 3; /** - * {@link #EDITED APN edit status} indicates that this APN has been edited by carriers. + * {@link #EDITED_STATUS APN edit status} indicates that this APN has been edited by + * carriers. *Type: INTEGER
* @hide */ @SystemApi - public static final int CARRIER_EDITED = 4; + public static final @EditStatus int CARRIER_EDITED = 4; /** - * {@link #EDITED APN edit status} indicates that this APN has been deleted by carriers. - * CARRIER_DELETED values are currently not used as there is no use case. If they are used, - * delete() will have to change accordingly. Currently it is hardcoded to USER_DELETED. + * {@link #EDITED_STATUS APN edit status} indicates that this APN has been deleted by + * carriers. CARRIER_DELETED values are currently not used as there is no use case. + * If they are used, delete() will have to change accordingly. Currently it is hardcoded to + * USER_DELETED. *Type: INTEGER
* @hide */ - public static final int CARRIER_DELETED = 5; + public static final @EditStatus int CARRIER_DELETED = 5; /** - * {@link #EDITED APN edit status} is an intermediate value used to indicate that an entry - * deleted by the carrier is still present in the new APN database and therefore must remain - * tagged as user deleted rather than completely removed from the database. + * {@link #EDITED_STATUS APN edit status} is an intermediate value used to indicate that an + * entry deleted by the carrier is still present in the new APN database and therefore must + * remain tagged as user deleted rather than completely removed from the database. * @hide */ public static final int CARRIER_DELETED_BUT_PRESENT_IN_XML = 6; @@ -3046,14 +3061,14 @@ public final class Telephony { public static final String APN_SET_ID = "apn_set_id"; /** - * Possible value for the{@link #APN_SET_ID} field. By default APNs will not belong to a - * set. If the user manually selects an APN with no set set, there is no need to prioritize - * any specific APN set ids. + * Possible value for the {@link #APN_SET_ID} field. By default APNs will not belong to a + * set. If the user manually selects an APN without apn set id, there is no need to + * prioritize any specific APN set ids. *Type: INTEGER
* @hide */ @SystemApi - public static final int NO_SET_SET = 0; + public static final int NO_APN_SET_ID = 0; /** * A unique carrier id associated with this APN @@ -3062,6 +3077,17 @@ public final class Telephony { */ public static final String CARRIER_ID = "carrier_id"; + /** @hide */ + @IntDef({ + UNEDITED, + USER_EDITED, + USER_DELETED, + CARRIER_DELETED, + CARRIER_EDITED, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface EditStatus {} + } /** diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index b750d4c89626d..b5a87585b567d 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -693,7 +693,7 @@ public class ApnSetting implements Parcelable { mmsc, mmsProxyAddress, mmsProxyPort, user, password, authType, mApnTypeBitmask, protocol, roamingProtocol, carrierEnabled, networkTypeBitmask, profileId, modemCognitive, maxConns, waitTime, maxConnsTime, mtu, mvnoType, mvnoMatchData, - Carriers.NO_SET_SET, TelephonyManager.UNKNOWN_CARRIER_ID); + Carriers.NO_APN_SET_ID, TelephonyManager.UNKNOWN_CARRIER_ID); } /** @@ -740,11 +740,11 @@ public class ApnSetting implements Parcelable { networkTypeBitmask, cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.PROFILE_ID)), cursor.getInt(cursor.getColumnIndexOrThrow( - Telephony.Carriers.MODEM_COGNITIVE)) == 1, - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MAX_CONNS)), - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.WAIT_TIME)), + Telephony.Carriers.MODEM_PERSIST)) == 1, + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MAX_CONNECTIONS)), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.WAIT_TIME_RETRY)), cursor.getInt(cursor.getColumnIndexOrThrow( - Telephony.Carriers.MAX_CONNS_TIME)), + Telephony.Carriers.TIME_LIMIT_FOR_MAX_CONNECTIONS)), cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MTU)), getMvnoTypeIntFromString( cursor.getString(cursor.getColumnIndexOrThrow( @@ -870,7 +870,7 @@ public class ApnSetting implements Parcelable { int mtu = UNSET_MTU; String mvnoType = ""; String mvnoMatchData = ""; - int apnSetId = Carriers.NO_SET_SET; + int apnSetId = Carriers.NO_APN_SET_ID; int carrierId = TelephonyManager.UNKNOWN_CARRIER_ID; if (version == 1) { typeArray = new String[a.length - 13];