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

This commit is contained in:
TreeHugger Robot
2016-10-13 02:05:30 +00:00
committed by Android (Google) Code Review

View File

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