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

Commit 0e05178d authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in StackScrollAlgorithm.isCyclingIn/Out" into main

parents 0c1ecb58 6e3eae76

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

+2 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ public class StackScrollAlgorithm { 
     */

    public boolean isCyclingOut(ExpandableNotificationRow row, AmbientState ambientState) {

        if (!NotificationHeadsUpCycling.isEnabled()) return false;

        if (row.getEntry() == null) return false;

        String cyclingOutKey = ambientState.getAvalanchePreviousHunKey();

        return row.getEntry().getKey().equals(cyclingOutKey);

    }
@@ -409,6 +410,7 @@ public class StackScrollAlgorithm { 
     */

    public boolean isCyclingIn(ExpandableNotificationRow row, AmbientState ambientState) {

        if (!NotificationHeadsUpCycling.isEnabled()) return false;

        if (row.getEntry() == null) return false;

        String cyclingInKey = ambientState.getAvalancheShowingHunKey();

        return row.getEntry().getKey().equals(cyclingInKey);

    }