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

Commit ca4c5a62 authored by Robert Carr's avatar Robert Carr
Browse files

Ensure surfaces are reparented before destroying parent. 

In destroyPreservedSurfaceLocked we open and close the global transaction
with the intention of ensuring that the reparent contained within is
completed before we send the destroy request below. This doesn't work as
the global transaction could be held open by another thread, e.g. we
may already be in the transaction.

Bug: 70530552
Bug: 71499373
Bug: 72894049
Test: Existing tests pass
Change-Id: Ie91da3c78eaf8fb52a21ae49ed190b42d92d0083
parent 850f29a1

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

+5 −3
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ class WindowStateAnimator { 


    private final Rect mTmpSize = new Rect();



    private final SurfaceControl.Transaction mReparentTransaction = new SurfaceControl.Transaction();



    WindowStateAnimator(final WindowState win) {

        final WindowManagerService service = win.mService;
@@ -371,9 +373,9 @@ class WindowStateAnimator { 
                // child layers need to be reparented to the new surface to make this

                // transparent to the app.

                if (mWin.mAppToken == null || mWin.mAppToken.isRelaunching() == false) {

                    SurfaceControl.openTransaction();

                    mPendingDestroySurface.reparentChildrenInTransaction(mSurfaceController);

                    SurfaceControl.closeTransaction();

                    mReparentTransaction.reparentChildren(mPendingDestroySurface.mSurfaceControl,

                            mSurfaceController.mSurfaceControl.getHandle())

                            .apply();

                }

            }

        }