Merge "Don't send SCREEN_ORIENTATION_UNSET to apps."

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

@@ -1103,6 +1103,11 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
         return mOrientation;
     }
 
+    /** Returns the app's preferred orientation regardless of its currently visibility state. */
+    int getOrientationIgnoreVisibility() {
+        return mOrientation;
+    }
+
     @Override
     void checkAppWindowsReadyToShow() {
         if (allDrawn == mAppAnimator.allDrawn) {

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

@@ -2716,7 +2716,7 @@ public class WindowManagerService extends IWindowManager.Stub
                 return SCREEN_ORIENTATION_UNSPECIFIED;
             }
 
-            return wtoken.getOrientation();
+            return wtoken.getOrientationIgnoreVisibility();
         }
     }