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

Commit 1553d541 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev

parents 0bdfc7be e441e7f1

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);