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

Merge "Add @Nullable on SubscriptionInfo#getGroupUuid"

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2019-02-27 23:39:16 +00:00
committed by Android (Google) Code Review
parent faf6bc77fd f386bfa13e
commit 6dabb47132
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();

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

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