Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9b47cd7 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Automerger Merge Worker
Browse files

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

Merge "Fix null checks in isInVisibleLocation." into tm-qpr-dev am: 87126479 am: c12661fb am: a3753e88 am: f6e43b1c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21850332



Change-Id: I7384fcdf74f3a55ee687e0ae078c3495723857cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d84b3c1 f6e43b1c

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

+5 −7
Original line number Diff line number Diff line
@@ -831,18 +831,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) {