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

Commit 6dabb471 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Add @Nullable on SubscriptionInfo#getGroupUuid"

parents faf6bc77 f386bfa1

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -45023,7 +45023,7 @@ package android.telephony { 
    method public String getCountryIso();

    method public int getDataRoaming();

    method public CharSequence getDisplayName();

    method public String getGroupUuid();

    method @Nullable public String getGroupUuid();

    method public String getIccId();

    method public int getIconTint();

    method @Deprecated public int getMcc();

telephony/java/android/telephony/SubscriptionInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ public class SubscriptionInfo implements Parcelable { 
     * @return group UUID a String of group UUID if it belongs to a group. Otherwise

     * it will return null.

     */

    public String getGroupUuid() {

    public @Nullable String getGroupUuid() {

        return mGroupUUID;

    }