Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Data connection for carrier specific APN" into rvc-d1-dev-plus-aosp am: e2b212e94e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12624999

Change-Id: Id017dddb5ff8f10d8bacf9e55a8dbca515309a0f
This commit is contained in:
Amit Mahajan
2020-09-18 08:54:24 +00:00
committed by Automerger Merge Worker
parent 228c664ed3 e2b212e94e
commit e662938fdf
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -9243,6 +9243,7 @@ package android.provider {
field public static final String APN_SET_ID = "apn_set_id";
field public static final int CARRIER_EDITED = 4; // 0x4
field public static final String EDITED_STATUS = "edited";
field public static final int MATCH_ALL_APN_SET_ID = -1; // 0xffffffff
field public static final String MAX_CONNECTIONS = "max_conns";
field public static final String MODEM_PERSIST = "modem_cognitive";
field public static final String MTU = "mtu";

14
core/java/android/provider/Telephony.java
View File

@@ -3956,15 +3956,23 @@ 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 without apn set id, there is no need to
* prioritize any specific APN set ids.
* Possible value for the {@link #APN_SET_ID} field. By default APNs are added to set 0.
* <p>Type: INTEGER</p>
* @hide
*/
@SystemApi
public static final int NO_APN_SET_ID = 0;
/**
* Possible value for the {@link #APN_SET_ID} field.
* APNs with MATCH_ALL_APN_SET_ID will be used regardless of any set ids of
* the selected APN.
* <p>Type: INTEGER</p>
* @hide
*/
@SystemApi
public static final int MATCH_ALL_APN_SET_ID = -1;
/**
* A unique carrier id associated with this APN
* {@see TelephonyManager#getSimCarrierId()}

1
non-updatable-api/system-current.txt
View File

@@ -8125,6 +8125,7 @@ package android.provider {
field public static final String APN_SET_ID = "apn_set_id";
field public static final int CARRIER_EDITED = 4; // 0x4
field public static final String EDITED_STATUS = "edited";
field public static final int MATCH_ALL_APN_SET_ID = -1; // 0xffffffff
field public static final String MAX_CONNECTIONS = "max_conns";
field public static final String MODEM_PERSIST = "modem_cognitive";
field public static final String MTU = "mtu";

20
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3914,10 +3914,23 @@ public class CarrierConfigManager {
* Indicating whether DUN APN should be disabled when the device is roaming. In that case,
* the default APN (i.e. internet) will be used for tethering.
*
* This config is only available when using Preset APN(not user edited) as Preferred APN.
*
* @hide
*/
public static final String KEY_DISABLE_DUN_APN_WHILE_ROAMING =
"disable_dun_apn_while_roaming";
public static final String KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL =
"disable_dun_apn_while_roaming_with_preset_apn_bool";
/**
* Where there is no preferred APN, specifies the carrier's default preferred APN.
* Specifies the {@link android.provider.Telephony.Carriers.APN} of the default preferred apn.
*
* This config is only available with Preset APN(not user edited).
*
* @hide
*/
public static final String KEY_DEFAULT_PREFERRED_APN_NAME_STRING =
"default_preferred_apn_name_string";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -4458,7 +4471,8 @@ public class CarrierConfigManager {
"ims:2", "cbs:2", "ia:2", "emergency:2", "mcx:3", "xcap:3"
});
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);
sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING, false);
sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);
sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
}
/**