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

Commit 03a6eadb authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add more nullability annotations" 

am: 3f2d69dc

Change-Id: I9b815b25cd48a5e24506f3f50fc6370bac1af552
parents ba4a9abe 3f2d69dc

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -42560,7 +42560,7 @@ package android.telephony { 
  public class MbmsGroupCallSession implements java.lang.AutoCloseable {

    method public void close();

    method @Nullable public static android.telephony.MbmsGroupCallSession create(@NonNull android.content.Context, int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.MbmsGroupCallSessionCallback);

    method public static android.telephony.MbmsGroupCallSession create(@NonNull android.content.Context, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.MbmsGroupCallSessionCallback);

    method @Nullable public static android.telephony.MbmsGroupCallSession create(@NonNull android.content.Context, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.MbmsGroupCallSessionCallback);

    method @Nullable public android.telephony.mbms.GroupCall startGroupCall(long, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.GroupCallCallback);

  }










@@ -42919,9 +42919,9 @@ package android.telephony {













    method public String getIccId();















    method public int getIconTint();















    method @Deprecated public int getMcc();













    method public String getMccString();













    method @Nullable public String getMccString();















    method @Deprecated public int getMnc();













    method public String getMncString();













    method @Nullable public String getMncString();















    method public String getNumber();















    method public int getSimSlotIndex();















    method public int getSubscriptionId();

























telephony/java/android/telephony/MbmsGroupCallSession.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -141,7 +141,7 @@ public class MbmsGroupCallSession implements AutoCloseable {













     * Create a new {@link MbmsGroupCallSession} using the system default data subscription ID.















     * See {@link #create(Context, int, Executor, MbmsGroupCallSessionCallback)}.















     */













    public static MbmsGroupCallSession create(@NonNull Context context,













    public static @Nullable MbmsGroupCallSession create(@NonNull Context context,















            @NonNull Executor executor, @NonNull MbmsGroupCallSessionCallback callback) {















        return create(context, SubscriptionManager.getDefaultSubscriptionId(), executor, callback);















    }

































telephony/java/android/telephony/SubscriptionInfo.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -425,14 +425,14 @@ public class SubscriptionInfo implements Parcelable {













    /**















     * @return The MCC, as a string.















     */













    public String getMccString() {













    public @Nullable String getMccString() {















        return this.mMcc;















    }































    /**















     * @return The MNC, as a string.















     */













    public String getMncString() {













    public @Nullable String getMncString() {















        return this.mMnc;















    }