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

Commit ed98ad97 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Fix PiP window on rotation 

Per suggestion, check WindowState.mInRelayout instead of mSurfaceResized
when trying to apply the companion SurfaceControl.Transaction of
WindowContainerTransaction.

mSurfaceResized is false when the client calls to relayout and client
renderer is paused, which can be triggered from home screen rotation for
PiP window.

Bug: 154236022
Test: manually rotate with PiP on screen
Change-Id: Ibbe1632de054a8f99c006050701d3472ddc3bbd9
parent 74918ad9

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());