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

Fix null checks in isInVisibleLocation.

Browse Source 
Prevent an NPE when row is null; remove unnecessary check for viewState,
since getViewState is @NonNull.

Fix: 271467317
Test: presubmit
Change-Id: Ia8e48b993893a81f8dd3ae4584fa1f48d9120460
This commit is contained in:
Ioana Alexandru
2023-03-08 12:48:50 +00:00
parent e8544a3742
commit e20411b813
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

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