From 345569f6ecf63c3214a444960cf36e7940fbc40b Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 13 Sep 2021 08:49:49 -0400
Subject: [PATCH] Add NPE protection to NextAlarmController dump

Test: manual
Fixes: 199469246
Change-Id: I8702c3ca69c31cb18264741c51bc31f874311f60
---
 .../systemui/statusbar/policy/NextAlarmControllerImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 22fd93ed10ed9..2d47c8f0b5778 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 @@ public class NextAlarmControllerImpl extends BroadcastReceiver
         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");
         }