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

Merge "Add NonNull in Carriers constant" into qt-dev am: c6a1bf1ac1

Browse Source 
am: d0ad497e6c

Change-Id: I428ff623d46d3891b05882df5774343bfe3234c0
This commit is contained in:
Calvin Pan
2019-04-15 11:12:18 -07:00
committed by android-build-merger
parent 3c3ff75442 d0ad497e6c
commit 28f2ead85b
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

@@ -39096,7 +39096,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";
@@ -39115,7 +39115,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

@@ -3394,6 +3394,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");
/** /**
@@ -3406,6 +3407,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");