commit d5a7fd1ec2c64e99cb52c2a4a31f9df5852895a3
author chen xu <fionaxu@google.com> Tue Mar 05 16:43:50 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Mar 05 16:43:50 2019 -0800
tree fbd328d8d7eda21ed678dd93b011864fd20a9e29
parent a465f8907f27c4602b8918e6e3977109b0ea5cee
parent 26fa24bf4f0051a012cd1bf7c6f82344d9c26805

Merge "add missing annotation for CarrierIdentifier" am: fd46a0aaeb
am: 26fa24bf4f

Change-Id: I3f19f615f5a042c4e041430fc94f3b3d918e6388

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 2275215..4735bb7 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -39438,7 +39438,7 @@
 
   public class CarrierIdentifier implements android.os.Parcelable {
     ctor public CarrierIdentifier(String, String, @Nullable String, @Nullable String, @Nullable String, @Nullable String);
-    ctor public CarrierIdentifier(String, String, @Nullable String, @Nullable String, @Nullable String, @Nullable String, int, int);
+    ctor public CarrierIdentifier(@NonNull String, @NonNull String, @Nullable String, @Nullable String, @Nullable String, @Nullable String, int, int);
     ctor public CarrierIdentifier(byte[], @Nullable String, @Nullable String);
     method public int describeContents();
     method public int getCarrierId();

core/java/android/service/carrier/CarrierIdentifier.java

diff --git a/core/java/android/service/carrier/CarrierIdentifier.java b/core/java/android/service/carrier/CarrierIdentifier.java
index 568ca0f..8c73a87 100644
--- a/core/java/android/service/carrier/CarrierIdentifier.java
+++ b/core/java/android/service/carrier/CarrierIdentifier.java
@@ -16,6 +16,7 @@
 
 package android.service.carrier;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -74,7 +75,7 @@
      * @param preciseCarrierId precise carrier identifier
      * {@link TelephonyManager#getSimPreciseCarrierId()}
      */
-    public CarrierIdentifier(String mcc, String mnc, @Nullable String spn,
+    public CarrierIdentifier(@NonNull String mcc, @NonNull String mnc, @Nullable String spn,
                              @Nullable String imsi, @Nullable String gid1, @Nullable String gid2,
                              int carrierid, int preciseCarrierId) {
         mMcc = mcc;