Merge "Add CarrierId column in TelephonyProvider"

am: 1df5ca6a71

Change-Id: I35fc941a9e7b1dace0b1572976dd854227e434a5
This commit is contained in:
Calvin Pan
2018-11-09 05:49:05 -08:00
committed by android-build-merger
2 changed files with 8 additions and 0 deletions

View File

@@ -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";

View File

@@ -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";
}
/**