Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing."

2021-02-01 05:03:30 +00:00
parent 98cbbc2348 daf7550a86
commit b3fc7e5b10
2 changed files with 23 additions and 0 deletions
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -338,6 +338,9 @@ public class SubscriptionUtil {
    @VisibleForTesting
    public static CharSequence getUniqueSubscriptionDisplayName(
            SubscriptionInfo info, Context context) {
+        if (info == null) {
+            return "";
+        }
        return getUniqueSubscriptionDisplayName(info.getSubscriptionId(), context);
    }