commit e658c48ea045679bd1264ccc3853bb3cc5bb1134
author Josh Hou <joshhou@google.com> Wed Mar 06 17:42:29 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 17:42:29 2019 -0800
tree c9b2f1b3b21d7eb510a562c5196763d9e38d4361
parent fe12d8de3f670c95b5006ca6301f53e2339e0254
parent 6131255e77ae2ccfb71b54686c8d19775bfde569

Merge "add NonNull annotation to API" am: fd2bb72030
am: 6131255e77

Change-Id: Id8fab7bd594db237c8353e3784a348688c602a85

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f964a57..52260f4 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -43375,7 +43375,7 @@
     method public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int);
     method public android.telephony.data.ApnSetting.Builder setAuthType(int);
     method public android.telephony.data.ApnSetting.Builder setCarrierEnabled(boolean);
-    method public android.telephony.data.ApnSetting.Builder setCarrierId(int);
+    method @NonNull public android.telephony.data.ApnSetting.Builder setCarrierId(int);
     method public android.telephony.data.ApnSetting.Builder setEntryName(String);
     method @Deprecated public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress);
     method public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(String);

telephony/java/android/telephony/data/ApnSetting.java

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index c802e63..1607817 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1868,6 +1868,7 @@
          *
          * @param carrierId the carrier id to set for this APN
          */
+        @NonNull
         public Builder setCarrierId(int carrierId) {
             this.mCarrierId = carrierId;
             return this;