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

Commit 03773fb7 authored by lyn's avatar lyn
Browse files

Null check representativeEntry in RankingCoordinator 

Bug: 395698521
Test: manual
Flag: com.android.systemui.notification_bundle_ui
Change-Id: Ifae6bdeeb014102fd118705f314c738183332bd7
parent 7c5b8d6e

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java

+13 −2
Original line number Diff line number Diff line
@@ -132,7 +132,12 @@ public class RankingCoordinator implements Coordinator { 
        public void onEntriesUpdated(@NonNull List<PipelineEntry> entries) {

            mHasSilentEntries = false;

            for (int i = 0; i < entries.size(); i++) {

                if (entries.get(i).getRepresentativeEntry().getSbn().isClearable()) {

                NotificationEntry notifEntry = entries.get(i).getRepresentativeEntry();

                if (notifEntry == null) {

                    // TODO(b/395698521) Handle BundleEntry

                    continue;

                }

                if (notifEntry.getSbn().isClearable()) {

                    mHasSilentEntries = true;

                    break;

                }
@@ -147,6 +152,7 @@ public class RankingCoordinator implements Coordinator { 
        @Override

        public boolean isInSection(PipelineEntry entry) {

            return !mHighPriorityProvider.isHighPriority(entry)

                    && entry.getRepresentativeEntry() != null

                    && entry.getRepresentativeEntry().isAmbient();

        }
@@ -161,7 +167,12 @@ public class RankingCoordinator implements Coordinator { 
        public void onEntriesUpdated(@NonNull List<PipelineEntry> entries) {

            mHasMinimizedEntries = false;

            for (int i = 0; i < entries.size(); i++) {

                if (entries.get(i).getRepresentativeEntry().getSbn().isClearable()) {

                NotificationEntry notifEntry = entries.get(i).getRepresentativeEntry();

                if (notifEntry == null) {

                    // TODO(b/395698521) Handle BundleEntry

                    continue;

                }

                if (notifEntry.getSbn().isClearable()) {

                    mHasMinimizedEntries = true;

                    break;

                }