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

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

Merge "Add null check for entry key" into main

parents e20d07c1 b3c6e602

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

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ public class StackScrollAlgorithm { 
    public boolean isCyclingOut(ExpandableNotificationRow row, AmbientState ambientState) {

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

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

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

        String cyclingOutKey = ambientState.getAvalanchePreviousHunKey();

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

    }
@@ -411,6 +412,7 @@ public class StackScrollAlgorithm { 
    public boolean isCyclingIn(ExpandableNotificationRow row, AmbientState ambientState) {

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

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

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

        String cyclingInKey = ambientState.getAvalancheShowingHunKey();

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

    }