From a028a1c3cdcc5226a9cf9c982aff31f66a8534f5 Mon Sep 17 00:00:00 2001
From: Josh Hou <joshhou@google.com>
Date: Mon, 4 Mar 2019 19:19:50 +0800
Subject: [PATCH] add NonNull annotation to API

Bug: 126700962
Test: Build pass
Change-Id: I50d8924b6f3323016cd68faa4769e608701b2134
---
 api/current.txt                                       | 2 +-
 telephony/java/android/telephony/data/ApnSetting.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index a2b6d51af30a4..5d7e0945fc9c7 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -43372,7 +43372,7 @@ package android.telephony.data {
     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);
diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index 0e695309fce23..1e3e3a44b4ebf 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1820,6 +1820,7 @@ public class ApnSetting implements Parcelable {
          *
          * @param carrierId the carrier id to set for this APN
          */
+        @NonNull
         public Builder setCarrierId(int carrierId) {
             this.mCarrierId = carrierId;
             return this;