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

Commit 287570ab authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix PiP window on rotation" into rvc-dev am: 8e4db580 

Change-Id: Ie6af91aa90a0b676f3641d2270fcba13dbbfc26c
parents 3a7eaced 8e4db580

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -884,8 +884,8 @@ class WindowStateAnimator { 
            clipRect = mTmpClipRect;

            clipRect = mTmpClipRect;

        }

        }





        if (mSurfaceResized && (mAttrType == TYPE_BASE_APPLICATION) &&

        if (w.mInRelayout && (mAttrType == TYPE_BASE_APPLICATION) && (task != null)

            (task != null) && (task.getMainWindowSizeChangeTransaction() != null)) {

                && (task.getMainWindowSizeChangeTransaction() != null)) {

            mSurfaceController.deferTransactionUntil(mWin.getClientViewRootSurface(),

            mSurfaceController.deferTransactionUntil(mWin.getClientViewRootSurface(),

                    mWin.getFrameNumber());

                    mWin.getFrameNumber());

            SurfaceControl.mergeToGlobalTransaction(task.getMainWindowSizeChangeTransaction());

            SurfaceControl.mergeToGlobalTransaction(task.getMainWindowSizeChangeTransaction());