diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2020-09-19 06:57:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-19 06:57:45 +0000 |
| commit | eb10ff679b154bd9ea7786b67eeb822718ac0c61 (patch) | |
| tree | b644919333f36541875b42626e7bd30b71385269 /core/java/android | |
| parent | 55895d941470ebeb6ccff96f4bce1a0d96df21df (diff) | |
| parent | ba9b99163128a31e8a4a218b92b8b4e5ea8e0943 (diff) | |
Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996
Change-Id: I5186d773ee3952cee516ac0ccb473352ca847ad9
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Telephony.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index fab70844989b..2c2d127b0414 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -3956,9 +3956,7 @@ 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 */ @@ -3966,6 +3964,16 @@ public final class Telephony { 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()} * <p>Type: STRING</p> |