Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NonNull in Carriers constant"

Browse Source 
am: 40c918b924

Change-Id: Ia7cc8c0bdd2c513d969ea29c2de55797f9c7e035
This commit is contained in:
calvinpan
2019-04-15 13:10:13 -07:00
committed by android-build-merger
parent 42aacac8ad 40c918b924
commit 2c9b7a4a2f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -37345,7 +37345,7 @@ package android.provider {
field @Deprecated public static final String BEARER = "bearer"; field @Deprecated public static final String BEARER = "bearer";
field public static final String CARRIER_ENABLED = "carrier_enabled"; field public static final String CARRIER_ENABLED = "carrier_enabled";
field public static final String CARRIER_ID = "carrier_id"; 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 CURRENT = "current";
field public static final String DEFAULT_SORT_ORDER = "name ASC"; field public static final String DEFAULT_SORT_ORDER = "name ASC";
field @Deprecated public static final String MCC = "mcc"; 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 PROXY = "proxy";
field public static final String ROAMING_PROTOCOL = "roaming_protocol"; field public static final String ROAMING_PROTOCOL = "roaming_protocol";
field public static final String SERVER = "server"; 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 SUBSCRIPTION_ID = "sub_id";
field public static final String TYPE = "type"; field public static final String TYPE = "type";
field public static final String USER = "user"; field public static final String USER = "user";

2
telephony/java/android/provider/Telephony.java
View File

@@ -3330,6 +3330,7 @@ public final class Telephony {
* {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM, * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM,
* use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id. * use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id.
*/ */
@NonNull
public static final Uri CONTENT_URI = Uri.parse("content://telephony/carriers"); 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, * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM,
* use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id. * use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id.
*/ */
@NonNull
public static final Uri SIM_APN_URI = Uri.parse( public static final Uri SIM_APN_URI = Uri.parse(
"content://telephony/carriers/sim_apn_list"); "content://telephony/carriers/sim_apn_list");