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

Commit 9c0e6629 authored by chaviw's avatar chaviw
Browse files

Don't clear sync information if WS is waiting on child windows 

If a WindowState is waiting on child windows to draw, then we shouldn't
clear the sync info since it won't call onTransactionReady yet. When the
child window is done drawing, it will call onTransactionReady for the
parent WindowState and clear the sync information at that point.

Test: Split screen no longer crashes with child window
Fixes: 158007547
Change-Id: I301899db648aac6977a9e415a199143d34bd93a1
parent 28fdf609

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

+2 −2
Original line number Diff line number Diff line
@@ -5790,10 +5790,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        // be invoked and we need to invoke it ourself.

        if (mLocalSyncId >= 0) {

            mBLASTSyncEngine.setReady(mLocalSyncId);

        } else {

            mWaitingListener.onTransactionReady(mWaitingSyncId, mBLASTSyncTransaction);

            return mWinAnimator.finishDrawingLocked(null);

        }



        mWaitingListener.onTransactionReady(mWaitingSyncId, mBLASTSyncTransaction);

        mUsingBLASTSyncTransaction = false;



        mWaitingSyncId = 0;