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

Commit 486238f7 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Correct recently introduced logic error in seamless rotation detection. am: e441e7f1 

am: bcbf6707

Change-Id: I856eec21e2d7687683a0bcde683ea6b7a05dd20a
parents 56be1837 bcbf6707

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

+2 −2
Original line number Diff line number Diff line
@@ -6831,7 +6831,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        final WindowList windows = displayContent.getWindowList();



        final int oldRotation = mRotation;

        boolean rotateSeamlessly = mPolicy.shouldRotateSeamlessly(oldRotation, mRotation);

        int rotation = mPolicy.rotationForOrientationLw(mLastOrientation, mRotation);

        boolean rotateSeamlessly = mPolicy.shouldRotateSeamlessly(oldRotation, rotation);



        if (rotateSeamlessly) {

            for (int i = windows.size() - 1; i >= 0; i--) {
@@ -6864,7 +6865,6 @@ public class WindowManagerService extends IWindowManager.Stub 
        //       an orientation that has different metrics than it expected.

        //       eg. Portrait instead of Landscape.



        int rotation = mPolicy.rotationForOrientationLw(mLastOrientation, mRotation);

        boolean altOrientation = !mPolicy.rotationHasCompatibleMetricsLw(

                mLastOrientation, rotation);