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

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

Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c4 

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

Change-Id: I811a29e48b4c6fda1708065bbc3e24f4500bcca8
parents 417edfb1 ac3ce5c4

services/core/java/com/android/server/wm/WindowStateAnimator.java

+3 −8
Original line number Diff line number Diff line
@@ -247,10 +247,6 @@ class WindowStateAnimator { 
    private final SurfaceControl.Transaction mPostDrawTransaction =

            new SurfaceControl.Transaction();



    // Used to track whether we have called detach children on the way to invisibility, in which

    // case we need to give the client a new Surface if it lays back out to a visible state.

    boolean mChildrenDetached = false;



    // Set to true after the first frame of the Pinned stack animation

    // and reset after the last to ensure we only reset mForceScaleUntilResize

    // once per animation.
@@ -425,7 +421,8 @@ class WindowStateAnimator { 
        // transparent to the app.

        // If the children are detached, we don't want to reparent them to the new surface.

        // Instead let the children get removed when the old surface is deleted.

        if (mSurfaceController != null && mPendingDestroySurface != null && !mChildrenDetached

        if (mSurfaceController != null && mPendingDestroySurface != null

                && !mPendingDestroySurface.mChildrenDetached

                && (mWin.mActivityRecord == null || !mWin.mActivityRecord.isRelaunching())) {

            mPostDrawTransaction.reparentChildren(

                    mPendingDestroySurface.getClientViewRootSurface(),
@@ -461,7 +458,6 @@ class WindowStateAnimator { 
        if (mSurfaceController != null) {

            return mSurfaceController;

        }

        mChildrenDetached = false;



        if ((mWin.mAttrs.privateFlags & PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY) != 0) {

            windowType = SurfaceControl.WINDOW_TYPE_DONT_SCREENSHOT;
@@ -1365,7 +1361,7 @@ class WindowStateAnimator { 
            mPostDrawTransaction.reparent(pendingSurfaceControl, null);

            // If the children are detached, we don't want to reparent them to the new surface.

            // Instead let the children get removed when the old surface is deleted.

            if (!mChildrenDetached) {

            if (!mPendingDestroySurface.mChildrenDetached) {

                mPostDrawTransaction.reparentChildren(

                        mPendingDestroySurface.getClientViewRootSurface(),

                        mSurfaceController.mSurfaceControl);
@@ -1596,7 +1592,6 @@ class WindowStateAnimator { 
        if (mSurfaceController != null) {

            mSurfaceController.detachChildren();

        }

        mChildrenDetached = true;

        // If the children are detached, it means the app is exiting. We don't want to tear the

        // content down too early, otherwise we could end up with a flicker. By preserving the

        // current surface, we ensure the content remains on screen until the window is completely

services/core/java/com/android/server/wm/WindowSurfaceController.java

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ class WindowSurfaceController { 


    private final SurfaceControl.Transaction mTmpTransaction;



    // Used to track whether we have called detach children on the way to invisibility.

    boolean mChildrenDetached;



    WindowSurfaceController(String name, int w, int h, int format,

            int flags, WindowStateAnimator animator, int windowType, int ownerUid) {

        mAnimator = animator;
@@ -144,6 +147,7 @@ class WindowSurfaceController { 


    void detachChildren() {

        ProtoLog.i(WM_SHOW_TRANSACTIONS, "SEVER CHILDREN");

        mChildrenDetached = true;

        if (mSurfaceControl != null) {

            mSurfaceControl.detachChildren();

        }