diff options
| author | Calvin Pan <calvinpan@google.com> | 2018-11-09 13:30:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-09 13:30:51 +0000 |
| commit | 1df5ca6a71731c526d2c8834d1b0b040f1dcc76e (patch) | |
| tree | fe1279fbc3fbb465768c58d5d528fe2b3d618542 | |
| parent | c6b17ad431c5bd9ee9221dac7939e1799becb95b (diff) | |
| parent | 3689c969512f6a1817863bbe3195146e1e504b7c (diff) | |
Merge "Add CarrierId column in TelephonyProvider"
| -rwxr-xr-x | api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/provider/Telephony.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index bcd8ebb05141..eb32f0600a24 100755 --- a/api/current.txt +++ b/api/current.txt @@ -37270,6 +37270,7 @@ package android.provider { field public static final java.lang.String AUTH_TYPE = "authtype"; field public static final deprecated java.lang.String BEARER = "bearer"; field public static final java.lang.String CARRIER_ENABLED = "carrier_enabled"; + field public static final java.lang.String CARRIER_ID = "carrier_id"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String CURRENT = "current"; field public static final java.lang.String DEFAULT_SORT_ORDER = "name ASC"; diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 109ffe96571f..b8088d536c50 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -2995,6 +2995,13 @@ public final class Telephony { @SystemApi public static final int NO_SET_SET = 0; + /** + * A unique carrier id associated with this APN + * {@see TelephonyManager#getSimCarrierId()} + * <p>Type: STRING</p> + */ + public static final String CARRIER_ID = "carrier_id"; + } /** |