Add @Nullable on SubscriptionInfo#getGroupUuid

SubscriptionInfo#getGroupUuid will return null if group is not set.

Bug: 123587615
Test: build
Change-Id: I592d35388d88bda1f908441824772fea36d43059
Merged-In: I592d35388d88bda1f908441824772fea36d43059

diff --git a/api/current.txt b/api/current.txt
index 6cdcd36..d2b81b0 100755 (executable)
--- a/api/current.txt
+++ b/api/current.txt
@@ -42918,7 +42918,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();

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 58f12e2..b781b10 100644 (file)
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -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;
     }