commit 345569f6ecf63c3214a444960cf36e7940fbc40b
author Beverly <beverlyt@google.com> Mon Sep 13 08:49:49 2021 -0400
committer Beverly <beverlyt@google.com> Mon Sep 13 08:49:49 2021 -0400
tree 6d3949602e908d4221b3ef019d1e3e2659552fe3
parent 9ca7052183e8400a344e5e24d60178c1aa420bd0

Add NPE protection to NextAlarmController dump

Test: manual
Fixes: 199469246
Change-Id: I8702c3ca69c31cb18264741c51bc31f874311f60

packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java
index 22fd93e..2d47c8f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NextAlarmControllerImpl.java
@@ -71,7 +71,11 @@
         if (mNextAlarm != null) {
             pw.println(new Date(mNextAlarm.getTriggerTime()));
             pw.print("  PendingIntentPkg=");
-            pw.println(mNextAlarm.getShowIntent().getCreatorPackage());
+            if (mNextAlarm.getShowIntent() != null) {
+                pw.println(mNextAlarm.getShowIntent().getCreatorPackage());
+            } else {
+                pw.println("showIntent=null");
+            }
         } else {
             pw.println("null");
         }