diff options
| author | 2019-04-15 19:53:50 +0000 | |
|---|---|---|
| committer | 2019-04-15 19:53:50 +0000 | |
| commit | 40c918b9247e36af10c3bb9d4cc1cf16f0217f60 (patch) | |
| tree | a83bb16fa0e11f16a73a5273add372d037d62f34 | |
| parent | 615006556087413906882d8861b477509789682f (diff) | |
| parent | 9f090e8a13879d485bff900579337e4ff5c25137 (diff) | |
Merge "Add NonNull in Carriers constant"
| -rwxr-xr-x | api/current.txt | 4 | ||||
| -rw-r--r-- | telephony/java/android/provider/Telephony.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 84aa98419f02..b7df38068263 100755 --- a/api/current.txt +++ b/api/current.txt @@ -37345,7 +37345,7 @@ package android.provider { field @Deprecated public static final String BEARER = "bearer"; field public static final String CARRIER_ENABLED = "carrier_enabled"; field public static final String CARRIER_ID = "carrier_id"; - field public static final android.net.Uri CONTENT_URI; + field @NonNull public static final android.net.Uri CONTENT_URI; field public static final String CURRENT = "current"; field public static final String DEFAULT_SORT_ORDER = "name ASC"; field @Deprecated public static final String MCC = "mcc"; @@ -37364,7 +37364,7 @@ package android.provider { field public static final String PROXY = "proxy"; field public static final String ROAMING_PROTOCOL = "roaming_protocol"; field public static final String SERVER = "server"; - field public static final android.net.Uri SIM_APN_URI; + field @NonNull public static final android.net.Uri SIM_APN_URI; field public static final String SUBSCRIPTION_ID = "sub_id"; field public static final String TYPE = "type"; field public static final String USER = "user"; diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 6dd683a1376e..ecb0daffeb7b 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -3330,6 +3330,7 @@ public final class Telephony { * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM, * use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id. */ + @NonNull public static final Uri CONTENT_URI = Uri.parse("content://telephony/carriers"); /** @@ -3342,6 +3343,7 @@ public final class Telephony { * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM, * use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id. */ + @NonNull public static final Uri SIM_APN_URI = Uri.parse( "content://telephony/carriers/sim_apn_list"); |