summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shawn Lee <syeonlee@google.com> 2023-10-25 17:29:58 -0700
committer Shawn Lee <syeonlee@google.com> 2023-11-17 14:59:20 -0800
commit63e22878dd91383d623a722ee2d39e282e5beddd (patch)
treece2dbe15454fa998ea6af4d603186857395d837d
parent8f0e9876d0dbc966b77ee7acf6868e5b5b40c569 (diff)
Null guard QS Header view in NSSL
Calls to mQsHeader in NSSL were causing an NPE on cuttlefish. Bug: 306992703 Test: NA Flag: NA Change-Id: I94ab3f68c6aa93a8eb96b5e18fbe745ca55b3cf5
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 1e9cfa8d1d3a..0807ef962f70 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -3715,6 +3715,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
}
protected boolean isInsideQsHeader(MotionEvent ev) {
+ if (mQsHeader == null) {
+ Log.wtf(TAG, "qsHeader is null while NSSL is handling a touch");
+ return false;
+ }
+
mQsHeader.getBoundsOnScreen(mQsHeaderBound);
/**
* One-handed mode defines a feature FEATURE_ONE_HANDED of DisplayArea {@link DisplayArea}