From 03c3abbaca90d4d0a759a445ff1b96b825fb2595 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Sun, 20 Nov 2022 17:37:02 -0800
Subject: [PATCH] Fixed crash when UUID string is empty

Added empty string check.

Bug: 239607619
Test: atest SubscriptionInfoTest
Change-Id: I2d7867c458d83301b6e3558bdc468458fcd13ffd
---
 telephony/java/android/telephony/SubscriptionInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index e055f637b72cc..db9dfbb6fe4cc 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -1527,7 +1527,7 @@ public class SubscriptionInfo implements Parcelable {
          */
         @NonNull
         public Builder setGroupUuid(@Nullable String groupUuid) {
-            mGroupUuid = groupUuid == null ? null : ParcelUuid.fromString(groupUuid);
+            mGroupUuid = TextUtils.isEmpty(groupUuid) ? null : ParcelUuid.fromString(groupUuid);
             return this;
         }