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

Commit aa9dd104 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:... 

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

Change-Id: I0713af3eac681192e3fd411418ae87c5b062f611
parents d920b9cd 486238f7

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

+2 −2
Original line number Diff line number Diff line
@@ -5430,7 +5430,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--) {
@@ -5463,7 +5464,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);