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

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

Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev

am: 9ffa8755

Change-Id: Ie32eee15d12660e096dd0a738195d846bde6c59f
parents 1b00c5db 9ffa8755
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -3164,7 +3164,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
    @Override
    @Override
    public void selectRotationAnimationLw(int anim[]) {
    public void selectRotationAnimationLw(int anim[]) {
        // If the screen is off or non-interactive, force a jumpcut.
        // If the screen is off or non-interactive, force a jumpcut.
        final boolean forceJumpcut = !mScreenOnFully || !mAwake;
        final boolean forceJumpcut = !mScreenOnFully || !okToAnimate();
        if (PRINT_ANIM) Slog.i(TAG, "selectRotationAnimation mTopFullscreen="
        if (PRINT_ANIM) Slog.i(TAG, "selectRotationAnimation mTopFullscreen="
                + mTopFullscreenOpaqueWindowState + " rotationAnimation="
                + mTopFullscreenOpaqueWindowState + " rotationAnimation="
                + (mTopFullscreenOpaqueWindowState == null ?
                + (mTopFullscreenOpaqueWindowState == null ?