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

Commit 043863ac authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge changes I2bb5d917,Ie91da3c7 

* changes:
  Rename destroyInTransaction to destroyNotInTransaction.
  Ensure surfaces are reparented before destroying parent.
parents 8744f573 a882886f

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

+8 −6
Original line number Diff line number Diff line
@@ -217,6 +217,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;
@@ -377,9 +379,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();

                }

            }

        }
@@ -593,7 +595,7 @@ class WindowStateAnimator { 
                        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {

                            WindowManagerService.logSurface(mWin, "DESTROY PENDING", true);

                        }

                        mPendingDestroySurface.destroyInTransaction();

                        mPendingDestroySurface.destroyNotInTransaction();

                    }

                    mPendingDestroySurface = mSurfaceController;

                }
@@ -630,7 +632,7 @@ class WindowStateAnimator { 
                if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {

                    WindowManagerService.logSurface(mWin, "DESTROY PENDING", true);

                }

                mPendingDestroySurface.destroyInTransaction();

                mPendingDestroySurface.destroyNotInTransaction();

                // Don't hide wallpaper if we're destroying a deferred surface

                // after a surface mode change.

                if (!mDestroyPreservedSurfaceUponRedraw) {
@@ -1408,7 +1410,7 @@ class WindowStateAnimator { 
    void destroySurface() {

        try {

            if (mSurfaceController != null) {

                mSurfaceController.destroyInTransaction();

                mSurfaceController.destroyNotInTransaction();

            }

        } catch (RuntimeException e) {

            Slog.w(TAG, "Exception thrown when destroying surface " + this

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ class WindowSurfaceController { 
        }

    }



    void destroyInTransaction() {

    void destroyNotInTransaction() {

        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {

            Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));

        }