commit bcbf6707b0b6969245421ef8b407cd43205b7378
author Robert Carr <racarr@google.com> Thu Oct 13 02:15:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 02:15:31 2016 +0000
tree a93cc59da1787485cc0a308cefef3431fb3204d9
parent 77988e4aec128e3ce08f14ccb258e34d66cb39d1
parent e441e7f15f28c4281e18eba339755344809ce6e7

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

Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 7a73759..ca2610a 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6831,7 +6831,8 @@
         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 @@
         //       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);