Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null checks in isInVisibleLocation." into tm-qpr-dev

Browse Source
This commit is contained in:
Ioana Alexandru
2023-03-17 13:52:31 +00:00
committed by Android (Google) Code Review
parent 4862211f2f e20411b813
commit 871264790e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
View File

@@ -827,18 +827,16 @@ public class NotificationStackScrollLayoutController {
private boolean isInVisibleLocation(NotificationEntry entry) { private boolean isInVisibleLocation(NotificationEntry entry) {
ExpandableNotificationRow row = entry.getRow(); ExpandableNotificationRow row = entry.getRow();
ExpandableViewState childViewState = row.getViewState(); if (row == null) {
if (childViewState == null) {
return false; return false;
} }
ExpandableViewState childViewState = row.getViewState();
if ((childViewState.location & ExpandableViewState.VISIBLE_LOCATIONS) == 0) { if ((childViewState.location & ExpandableViewState.VISIBLE_LOCATIONS) == 0) {
return false; return false;
} }
if (row.getVisibility() != View.VISIBLE) {
return false; return row.getVisibility() == View.VISIBLE;
}
return true;
} }
public boolean isViewAffectedBySwipe(ExpandableView expandableView) { public boolean isViewAffectedBySwipe(ExpandableView expandableView) {