From f386bfa13ee75fb8a006d4415583c294ba9d734d Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Tue, 26 Feb 2019 19:42:56 -0800
Subject: [PATCH] Add @Nullable on SubscriptionInfo#getGroupUuid

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

Bug: 123587615
Test: build
Change-Id: I592d35388d88bda1f908441824772fea36d43059
---
 api/current.txt                                        | 2 +-
 telephony/java/android/telephony/SubscriptionInfo.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index ae0258b5d109..4fe1179003b0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45016,7 +45016,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 17acf2bcdd1d..108af617fccc 100644
--- 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;
     }
 
-- 
2.11.0