Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5a7fd1e authored by chen xu's avatar chen xu Committed by android-build-merger
Browse files

Merge "add missing annotation for CarrierIdentifier" am: fd46a0aa 

am: 26fa24bf

Change-Id: I3f19f615f5a042c4e041430fc94f3b3d918e6388
parents a465f890 26fa24bf

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39438,7 +39438,7 @@ package android.service.carrier { 














  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



+2
−1




























Original line number
Diff line number
Diff line








@@ -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 @@ public class CarrierIdentifier implements Parcelable {













     * @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;