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

Commit 156b7884 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "WM: Guard against released surfaces in forced rotator" into pi-dev am: 9352e362 

am: 3a75c9ec

Change-Id: I5713af0c6add189454cf44b2d765a2336c006e83
parents 1f59d3c4 3a75c9ec

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

+8 −6
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public class ForcedSeamlessRotator { 
    public void finish(WindowToken token, WindowState win) {

        mTransform.reset();

        token.getPendingTransaction().setMatrix(token.mSurfaceControl, mTransform, mFloat9);

        if (win.mWinAnimator.mSurfaceController != null) {

            token.getPendingTransaction().deferTransactionUntil(token.mSurfaceControl,

                    win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),

                    win.getFrameNumber());
@@ -76,3 +77,4 @@ public class ForcedSeamlessRotator { 
                    win.getFrameNumber());

        }

    }

}