commit 1deae4e73b772169c85f5ac5fd601d7d45870fb7
author Josh Hou <joshhou@google.com> Wed Mar 06 17:55:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 17:55:41 2019 -0800
tree 8b6463cfa6d164d05745442fb400a2ff99c25470
parent b32c31d1a9b48523952c019803591f0a425b9411
parent e658c48ea045679bd1264ccc3853bb3cc5bb1134

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

Change-Id: I723c22a0b7e76808cf60667ef7b2fcffac8ce71c

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index c467270..9563ea7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45422,7 +45422,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 be6f383..0b1d1fb 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;