Merge "Fixed crash when UUID string is empty"

2022-11-21 06:01:53 +00:00
parent 1b86b3fa2a 03c3abbaca
commit 7404725832
1 changed files with 1 additions and 1 deletions
--- 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;
        }