From ef7b99adae7375ae8cfb252307a38835aea8ed03 Mon Sep 17 00:00:00 2001 From: calvinpan Date: Fri, 12 Apr 2019 18:48:18 +0800 Subject: [PATCH] Add NonNull in Carriers constant Add NonNull in Carriers constant Bug: 126699334 Test: build pass Change-Id: I1cc3db5a4bb778e1693ebfff37dca6e136251f1b --- api/current.txt | 4 ++-- 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 ccfc0f5fd57f2..3f6aef1affa3b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39335,7 +39335,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"; @@ -39354,7 +39354,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 2d8a8cbae59f3..037e47520c94d 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -3394,6 +3394,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"); /** @@ -3406,6 +3407,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");