| commit | e428cb6151d6b8ead0da7a54b558199dbdf98085 | [log] [tgz] |
|---|---|---|
| author | Lyn Han <lynhan@google.com> | Tue Jul 23 18:25:47 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 23 18:25:47 2024 +0000 |
| tree | 2e2fd3220f34bfac0b97dd3f2e599f719a70e8c5 | |
| parent | b12649489b27b31bf74db6896b92ab148a9bdb94 [diff] | |
| parent | b971bae3c5d44356ceedbb0623e9eeb2b14d7a01 [diff] |
Merge "Fix NPE: NotificationEntry.isStickyAndNotDemoted" into main
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java index 6517135..dcd9cae 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java
@@ -852,6 +852,8 @@ } public boolean isStickyForSomeTime() { + if (mEntry == null) return false; + return mEntry.isStickyAndNotDemoted(); }