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

Commit 3162b8f7 authored by Adrian Roos's avatar Adrian Roos
Browse files

AOD: Fix rotation during screen off (again) 

Fixes another issue where the screen could rotate during the screen-off transition.
mAwake is still true during goingToSleep, but we should no longer play rotation
animations if we are going to sleep. Instead use the more appropriately named
okToAnimate.

Change-Id: I816d1552de3fea0a19ce42ca50d845eb46f80625
Fixes: 63760853
Test: Trigger show-when-locked navigation, rotate phone to landscape, trigger assistant, go to sleep. Verify no rotation plays; go/wm-smoke
parent aaf38609

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3164,7 +3164,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    public void selectRotationAnimationLw(int anim[]) {

        // 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="

                + mTopFullscreenOpaqueWindowState + " rotationAnimation="

                + (mTopFullscreenOpaqueWindowState == null ?