commit e37d04bd1957ca2b6813f33b0efd1b3c51d9c69f
author Tyler Gunn <tgunn@google.com> Mon Sep 13 16:56:37 2021 -0700
committer Tyler Gunn <tgunn@google.com> Mon Sep 13 23:57:56 2021 +0000
tree 55cb346208e896c345b501bda7c22fbd0bb917a3
parent ec34f34552bd0ade22f0fafa217a48458904f99f

Fix crash in SubscriptionInfoHelper for null display name.

Test: Add unit test for this case
Bug: 198728993
Change-Id: I3b13843f5229489d3d0625ab7a723f6c7aa1b913

src/com/android/phone/SubscriptionInfoHelper.java

diff --git a/src/com/android/phone/SubscriptionInfoHelper.java b/src/com/android/phone/SubscriptionInfoHelper.java
index 7c373e0..14faebc 100644
--- a/src/com/android/phone/SubscriptionInfoHelper.java
+++ b/src/com/android/phone/SubscriptionInfoHelper.java
@@ -91,7 +91,8 @@
 
         intent.putExtra(SubscriptionInfoHelper.SUB_ID_EXTRA, subscription.getSubscriptionId());
         intent.putExtra(
-                SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName().toString());
+                SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName() == null ? null
+                        : subscription.getDisplayName().toString());
     }
 
     /**