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

Commit a65eba01 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge changes I281c748a,Ia5b68d59 into pi-dev 

am: 9335f1e3

Change-Id: Ie9562fa69fe9dc52f0464d208e1153420bb7c872
parents 89876010 9335f1e3

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

+0 −8
Original line number Diff line number Diff line
@@ -4415,14 +4415,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


        result |= (!wasVisible || !isDrawnLw()) ? RELAYOUT_RES_FIRST_TIME : 0;



        if (mWinAnimator.mChildrenDetached) {

            // If there are detached children hanging around we need to force

            // the client receiving a new Surface.

            mWinAnimator.preserveSurfaceLocked();

            result |= RELAYOUT_RES_SURFACE_CHANGED

                    | RELAYOUT_RES_FIRST_TIME;

        }



        if (mAnimatingExit) {

            Slog.d(TAG, "relayoutVisibleWindow: " + this + " mAnimatingExit=true, mRemoveOnExit="

                    + mRemoveOnExit + ", mDestroying=" + mDestroying);

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

+1 −0
Original line number Diff line number Diff line
@@ -1298,6 +1298,7 @@ class WindowStateAnimator { 
        // if we are transparent.

        if (mPendingDestroySurface != null && mDestroyPreservedSurfaceUponRedraw) {

            mPendingDestroySurface.mSurfaceControl.hide();

            mPendingDestroySurface.reparentChildrenInTransaction(mSurfaceController);

        }



        return true;