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

Commit 582387e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE from freeing expanded view while expanding." into rvc-dev am: a2ed294a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978882

Change-Id: Iae47af780ef07eea3feefe0d7bfe861a7f0a8c11
parents 38b59f91 a2ed294a

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -660,6 +660,14 @@ public class NotificationContentView extends FrameLayout { 




    private void updateContentTransformation() {

    private void updateContentTransformation() {

        int visibleType = calculateVisibleType();

        int visibleType = calculateVisibleType();

        if (getTransformableViewForVisibleType(mVisibleType) == null) {

            // Case where visible view was removed in middle of transformation. In this case, we

            // just update immediately to the appropriate view.

            mVisibleType = visibleType;

            updateViewVisibilities(visibleType);

            updateBackgroundColor(false);

            return;

        }

        if (visibleType != mVisibleType) {

        if (visibleType != mVisibleType) {

            // A new transformation starts

            // A new transformation starts

            mTransformationStartVisibleType = mVisibleType;

            mTransformationStartVisibleType = mVisibleType;