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

Commit f81b7bcd authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Make sure to clear outdated screenshot of splitting tasks" into tm-qpr-dev am: 64dd311d 

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



Change-Id: I9f3efb866b68bd533622bc734d575addbbf99989
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a931422 64dd311d

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

+8 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ public class SplitDecorManager extends WindowlessWindowManager { 
            t.remove(mGapBackgroundLeash);

            mGapBackgroundLeash = null;

        }

        if (mScreenshot != null) {

            t.remove(mScreenshot);

            mScreenshot = null;

        }

        mHostLeash = null;

        mIcon = null;

        mResizingIconView = null;
@@ -323,6 +327,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

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

                mScreenshotAnimator.cancel();

            } else if (mScreenshot != null) {

                t.remove(mScreenshot);

            }



            mTempRect.set(mOldBounds);
@@ -339,6 +345,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

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

                mScreenshotAnimator.cancel();

            } else if (mScreenshot != null) {

                t.remove(mScreenshot);

            }



            mScreenshot = screenshot;