commit 2e6891135e4245ba28e8dfb22991a973d9daef9e
author Jeff DeCew <jeffdq@google.com> Thu Oct 22 16:56:13 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 22 16:56:13 2020 +0000
tree 7d6b10091a81ffbdb49ad3072f9e99539f718ddb
parent f547d5766a72ad71939ad96757d733fdd555fa68
parent b851fee8577246eb9246d5c7476d98de59a16f8a

Merge "Fix NPE in NotificationRow"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index f788dfe..3f13306 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -2856,7 +2856,8 @@
         }
         float x = event.getX();
         float y = event.getY();
-        NotificationHeaderView header = getVisibleNotificationViewWrapper().getNotificationHeader();
+        NotificationViewWrapper wrapper = getVisibleNotificationViewWrapper();
+        NotificationHeaderView header = wrapper == null ? null : wrapper.getNotificationHeader();
         if (header != null && header.isInTouchRect(x - getTranslation(), y)) {
             return true;
         }