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

Commit ae379040 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:... 

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

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

Change-Id: Ied9f6aaa54259b1d4fcc41c944755b54adf31549
parents 1e363278 8735bd3b

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

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


    private void updateContentTransformation() {

        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) {

            // A new transformation starts

            mTransformationStartVisibleType = mVisibleType;