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

Commit 59422994 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE if draging again while animating" into tm-dev am: a876e7b2 am: d1557103 

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



Change-Id: If515f22e9d61134919e4cc258c3ffc1301bb10af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d75139de d1557103

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java

+10 −5
Original line number Diff line number Diff line
@@ -160,6 +160,15 @@ public class SplitDecorManager extends WindowlessWindowManager { 
            mBounds.set(newBounds);

        }



        final boolean show =

                newBounds.width() > mBounds.width() || newBounds.height() > mBounds.height();

        final boolean animate = show != mShown;

        if (animate && mFadeAnimator != null && mFadeAnimator.isRunning()) {

            // If we need to animate and animator still running, cancel it before we ensure both

            // background and icon surfaces are non null for next animation.

            mFadeAnimator.cancel();

        }



        if (mBackgroundLeash == null) {

            mBackgroundLeash = SurfaceUtils.makeColorLayer(mHostLeash,

                    RESIZING_BACKGROUND_SURFACE_NAME, mSurfaceSession);
@@ -183,11 +192,7 @@ public class SplitDecorManager extends WindowlessWindowManager { 
                newBounds.width() / 2 - mIconSize / 2,

                newBounds.height() / 2 - mIconSize / 2);



        boolean show = newBounds.width() > mBounds.width() || newBounds.height() > mBounds.height();

        if (show != mShown) {

            if (mFadeAnimator != null && mFadeAnimator.isRunning()) {

                mFadeAnimator.cancel();

            }

        if (animate) {

            startFadeAnimation(show, false /* isResized */);

            mShown = show;

        }