commit 2c5f23d3d045a9ddc25549c43a1a07d816df1dff
author Sarah Chin <sarahchin@google.com> Mon Nov 02 21:52:11 2020 -0800
committer Sarah Chin <sarahchin@google.com> Thu Nov 19 00:20:03 2020 -0800
tree 824661297bf0b3abe25b7669853db9c6a507573a
parent 8e4f8fa79d46c6ad1bcda8271e19c0c425e3f63b

Fix NPE in NotificationMgr

Test: build
Fix: 172290162
Change-Id: I0c9b733ea143bfcffbb6ad58a9d47b408001ed6c
Merged-In: I0c9b733ea143bfcffbb6ad58a9d47b408001ed6c

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index c2dece5..fe4a0ba 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -536,7 +536,11 @@
                 int slotId = SubscriptionManager.getSlotIndex(subId);
                 resId = (slotId == 0) ? R.drawable.stat_sys_phone_call_forward_sub1
                         : R.drawable.stat_sys_phone_call_forward_sub2;
-                notificationTitle = subInfo.getDisplayName().toString();
+                if (subInfo.getDisplayName() != null) {
+                    notificationTitle = subInfo.getDisplayName().toString();
+                } else {
+                    notificationTitle = mContext.getString(R.string.labelCF);
+                }
             } else {
                 notificationTitle = mContext.getString(R.string.labelCF);
             }