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

Commit a7ebe2c7 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev 

am: 3e04c564

* commit '3e04c564':
  Fixed a crash with min-priority notifications in a group

Change-Id: I3167891563ba73c895ca41ed0cfead37c6601110
parents 0ee1a7e8 3e04c564

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+2 −3
Original line number Diff line number Diff line
@@ -2184,9 +2184,8 @@ public abstract class BaseStatusBar extends SystemUI implements 
                    == View.VISIBLE;

            boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification);

            if (suppressedSummary || (isLockscreenPublicMode() && !mShowLockscreenNotifications) ||

                    (onKeyguard && (visibleNotifications >= maxNotifications

                            && !childWithVisibleSummary

                            || !showOnKeyguard))) {

                    (onKeyguard && !childWithVisibleSummary

                            && (visibleNotifications >= maxNotifications || !showOnKeyguard))) {

                entry.row.setVisibility(View.GONE);

                if (onKeyguard && showOnKeyguard && !childNotification && !suppressedSummary) {

                    mKeyguardIconOverflowContainer.getIconsView().addNotification(entry);

packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java

+0 −5
Original line number Diff line number Diff line
@@ -823,11 +823,6 @@ public class StackStateAnimator { 
                    // The position for this child was never generated, let's continue.

                    continue;

                }

                if (changingView.getVisibility() == View.GONE) {

                    // The view was set to gone but the state never removed

                    finalState.removeViewStateForView(changingView);

                    continue;

                }

                finalState.applyState(changingView, viewState);

                mNewAddChildren.add(changingView);