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

Commit 4026add7 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "WindowManager: Handle main window size change transaction with BLAST."... 

Merge "WindowManager: Handle main window size change transaction with BLAST." into sc-dev am: 77832050

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855848

Change-Id: I260cf4a941bb6e7e45445eb46f0877a6619f0634
parents 1d57a3b9 77832050

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

+9 −13
Original line number Diff line number Diff line
@@ -538,22 +538,18 @@ class WindowStateAnimator { 
                // The sync transaction will contain the buffer so the bounds change transaction

                // will only be applied with the buffer.

                t.merge(task.getMainWindowSizeChangeTransaction());

                task.setMainWindowSizeChangeTransaction(null);

            } else {

                // Use pending transaction here instead of the transaction passed in because we

                // want to ensure the defer transaction is applied on the main transaction and

                // not on the sync  transaction. This is because the sync transaction could

                // contain the buffer and we'd defer the transaction that contains the buffer

                // we're deferring on.

                SurfaceControl.Transaction pendingTransaction = mWin.getPendingTransaction();

                pendingTransaction.deferTransactionUntil(

                        task.getMainWindowSizeChangeTask().getSurfaceControl(),

                        mWin.getClientViewRootSurface(), mWin.getFrameNumber());

                pendingTransaction.deferTransactionUntil(mSurfaceController.mSurfaceControl,

                        mWin.getClientViewRootSurface(), mWin.getFrameNumber());

                pendingTransaction.merge(task.getMainWindowSizeChangeTransaction());

            }

                mWin.applyWithNextDraw(finishedFrame -> {

                      final SurfaceControl.Transaction sizeChangedTransaction =

                          task.getMainWindowSizeChangeTransaction();

                      if (sizeChangedTransaction != null) {

                          finishedFrame.merge(sizeChangedTransaction);

                          task.setMainWindowSizeChangeTransaction(null);

                      }

                });

            }

        }

    }



    void prepareSurfaceLocked(SurfaceControl.Transaction t) {