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

Commit 1172fbff authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 317865a4 ab6ba996

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

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

    @Override

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

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

            long duration) {

            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;

        boolean oldShowingPublic = mShowingPublic;

        mShowingPublic = mSensitive && hideSensitive;

        mShowingPublic = mSensitive && hideSensitive;

        if (mShowingPublicInitialized && mShowingPublic == oldShowingPublic) {

        if (mShowingPublicInitialized && mShowingPublic == oldShowingPublic) {

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

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

                // This item is added, initialize it's properties.

                ExpandableViewState viewState = finalState

                ExpandableViewState viewState = finalState

                        .getViewStateForView(changingView);

                        .getViewStateForView(changingView);

                if (viewState == null) {

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

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

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

                    continue;

                    continue;

                }

                }