Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev

am: 17844f2257 Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8
2017-08-07 10:49:05 +00:00
parent c5622b88bd 17844f2257
commit 083a84c6ae
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1224,8 +1224,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
        // TODO(b/62846907): Checking against {@link mLastReportedConfiguration} could be flaky as
        //                   this is not necessarily what the client has processed yet. Find a
        //                   better indicator consistent with the client.
-        return mOrientationChanging || (isVisible()
-                && getConfiguration().orientation != mLastReportedConfiguration.orientation);
+        return (mOrientationChanging || (isVisible()
+                && getConfiguration().orientation != mLastReportedConfiguration.orientation))
+                && !mSeamlesslyRotated;
    }

    void setOrientationChanging(boolean changing) {