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

Commit d6bbffc2 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 am: 287570ab am: 9c26a761 

Change-Id: Iea8ddd83778b2212b5bdd28022fae37efc2f45e4
parents e1603566 9c26a761

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

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

        }



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

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

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

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

            mSurfaceController.deferTransactionUntil(mWin.getClientViewRootSurface(),

                    mWin.getFrameNumber());

            SurfaceControl.mergeToGlobalTransaction(task.getMainWindowSizeChangeTransaction());