Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more nullability annotations"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-08 03:16:43 +00:00
committed by Gerrit Code Review
parent 65087f4705 b22bfe4f3e
commit 3f2d69dc62
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -42560,7 +42560,7 @@ package android.telephony {
public class MbmsGroupCallSession implements java.lang.AutoCloseable { public class MbmsGroupCallSession implements java.lang.AutoCloseable {
method public void close(); 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 @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); 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 String getIccId();
method public int getIconTint(); method public int getIconTint();
method @Deprecated public int getMcc(); method @Deprecated public int getMcc();
method public String getMccString(); method @Nullable public String getMccString();
method @Deprecated public int getMnc(); method @Deprecated public int getMnc();
method public String getMncString(); method @Nullable public String getMncString();
method public String getNumber(); method public String getNumber();
method public int getSimSlotIndex(); method public int getSimSlotIndex();
method public int getSubscriptionId(); method public int getSubscriptionId();

2
telephony/java/android/telephony/MbmsGroupCallSession.java
View File

@@ -141,7 +141,7 @@ public class MbmsGroupCallSession implements AutoCloseable {
* Create a new {@link MbmsGroupCallSession} using the system default data subscription ID. * Create a new {@link MbmsGroupCallSession} using the system default data subscription ID.
* See {@link #create(Context, int, Executor, MbmsGroupCallSessionCallback)}. * 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) { @NonNull Executor executor, @NonNull MbmsGroupCallSessionCallback callback) {
return create(context, SubscriptionManager.getDefaultSubscriptionId(), executor, callback); return create(context, SubscriptionManager.getDefaultSubscriptionId(), executor, callback);
} }

4
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -425,14 +425,14 @@ public class SubscriptionInfo implements Parcelable {
/** /**
* @return The MCC, as a string. * @return The MCC, as a string.
*/ */
public String getMccString() { public @Nullable String getMccString() {
return this.mMcc; return this.mMcc;
} }
/** /**
* @return The MNC, as a string. * @return The MNC, as a string.
*/ */
public String getMncString() { public @Nullable String getMncString() {
return this.mMnc; return this.mMnc;
} }