summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-11-21 06:01:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-11-21 06:01:53 +0000
commit74047258329d97f13f420b2f5544d02dfbd707e5 (patch)
treef42a81ed502dbd8e34a20650167b6a39129bfd9c
parent1b86b3fa2afe413fad65c6406d872c92456af525 (diff)
parent03c3abbaca90d4d0a759a445ff1b96b825fb2595 (diff)
Merge "Fixed crash when UUID string is empty"
-rw-r--r--telephony/java/android/telephony/SubscriptionInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index e055f637b72c..db9dfbb6fe4c 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;
}