commit 9f090e8a13879d485bff900579337e4ff5c25137
author calvinpan <calvinpan@google.com> Fri Apr 12 09:14:02 2019 +0800
committer Calvin Pan <calvinpan@google.com> Mon Apr 15 18:23:45 2019 +0000
tree f17e01b5fa5956361a10140ace029efa806173b8
parent 08d4a537ec2de38c162c888cad76e085b8d37625

Add NonNull in Carriers constant

Add NonNull in Carriers constant

Bug: 126699334
Test: build pass
Change-Id: Ifda6407092847e8863cba79360eba3df12f9c7e1
Merged-In: I428ff623d46d3891b05882df5774343bfe3234c0

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e419f92..f3dac25 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -37345,7 +37345,7 @@
     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 @@
     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";

telephony/java/android/provider/Telephony.java

diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index 6dd683a..ecb0daf 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -3330,6 +3330,7 @@
          * {@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 @@
          * {@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");