diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2020-09-19 05:37:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-19 05:37:38 +0000 |
| commit | ba9b99163128a31e8a4a218b92b8b4e5ea8e0943 (patch) | |
| tree | e7667349f7cce9ff27afb71476e806488d85a462 /core/java | |
| parent | 7420236576061f0ab0ff34ee93aed005b5a6fca5 (diff) | |
| parent | 47a1e949c3d61ccba22e9d378028e505135d9ee5 (diff) | |
Merge "Data connection for carrier specific APN" am: 47a1e949c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996
Change-Id: Iefc784867da56b9ac0acfe0ac3744da9a3625a14
Diffstat (limited to 'core/java')
| -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> |