commit 6a82e72c124a56830012240fd20227d6f08a985c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 14 03:14:34 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 14 03:14:34 2019 +0000
tree 52a6baf693235232ee4f29e46f8d287d50692adb
parent de5593bb6e1faa13fd1d3bd9ad465384ffaeeff1
parent a31617d2e97df093929a3400fda919334057f45f

Merge "Fix NPE for auto-bubble notifications"

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 888e3fe..f3a701e 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -426,7 +426,9 @@
 
         if (reason == BubbleController.DISMISS_USER_GESTURE) {
             Notification.BubbleMetadata bubbleMetadata = bubble.entry.getBubbleMetadata();
-            PendingIntent deleteIntent = bubbleMetadata.getDeleteIntent();
+            PendingIntent deleteIntent = bubbleMetadata != null
+                    ? bubbleMetadata.getDeleteIntent()
+                    : null;
             if (deleteIntent != null) {
                 try {
                     deleteIntent.send();