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

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

Merge "Merge "Fixed an issue where a notification could become empty" into... 

Merge "Merge "Fixed an issue where a notification could become empty" into pi-dev am: 68b0bb40" into pi-dev-plus-aosp
am: 1172fbff

Change-Id: Ia33277e76491510cead65ec54b87db7741a34cc9
parents bec6d256 1172fbff

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

+5 −0
Original line number Diff line number Diff line
@@ -2286,6 +2286,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    @Override

    public void setHideSensitive(boolean hideSensitive, boolean animated, long delay,

            long duration) {

        if (getVisibility() == GONE) {

            // If we are GONE, the hideSensitive parameter will not be calculated and always be

            // false, which is incorrect, let's wait until a real call comes in later.

            return;

        }

        boolean oldShowingPublic = mShowingPublic;

        mShowingPublic = mSensitive && hideSensitive;

        if (mShowingPublicInitialized && mShowingPublic == oldShowingPublic) {

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

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class StackStateAnimator { 
                // This item is added, initialize it's properties.

                ExpandableViewState viewState = finalState

                        .getViewStateForView(changingView);

                if (viewState == null) {

                if (viewState == null || viewState.gone) {

                    // The position for this child was never generated, let's continue.

                    continue;

                }