commit 26fa24bf4f0051a012cd1bf7c6f82344d9c26805
author chen xu <fionaxu@google.com> Tue Mar 05 15:33:18 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Mar 05 15:33:18 2019 -0800
tree 43b9259ecc14c5418d696841ee49d6d7fb762892
parent 7ce366a28eb65bcfa5116dc479cb7d2e890ca9b9
parent fd46a0aaeb3164b23570b8593a6f7896f5c1baea

Merge "add missing annotation for CarrierIdentifier"
am: fd46a0aaeb

Change-Id: Ifbee0be758972174191967de245523e003790fb1

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index a0a9c43..920fd41 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -39440,7 +39440,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;