DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.

Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a

2 files changed, 8 insertions, 7 deletions

diff --git a/services/java/com/android/server/wm/DimSurface.java b/services/java/com/android/server/wm/DimSurface.java
index 084ac6f..220c7fb 100644
--- a/services/java/com/android/server/wm/DimSurface.java
+++ b/services/java/com/android/server/wm/DimSurface.java
@@ -89,7 +89,7 @@ class DimSurface {
     public void printTo(String prefix, PrintWriter pw) {
         pw.print(prefix); pw.print("mDimSurface="); pw.println(mDimSurface);
         pw.print(prefix); pw.print("mDimShown="); pw.print(mDimShown);
-                pw.print(" mLayer="); pw.println(mLayer);
+                pw.print(" mLayer="); pw.print(mLayer);
                 pw.print(" mDimColor=0x"); pw.println(Integer.toHexString(mDimColor));
         pw.print(prefix); pw.print("mLastDimWidth="); pw.print(mLastDimWidth);
                 pw.print(" mLastDimWidth="); pw.println(mLastDimWidth);
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 980696d..4b9ce90 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -5854,6 +5854,7 @@ public class WindowManagerService extends IWindowManager.Stub
             mInitialDisplayWidth = mCurDisplayWidth = mDisplay.getRealWidth();
             mInitialDisplayHeight = mCurDisplayHeight = mDisplay.getRealHeight();
             mInputManager.setDisplaySize(0, mDisplay.getRawWidth(), mDisplay.getRawHeight());
+            mPolicy.setInitialDisplaySize(mInitialDisplayWidth, mInitialDisplayHeight);
         }
 
         try {
@@ -8730,21 +8731,21 @@ public class WindowManagerService extends IWindowManager.Stub
                     pw.print(", mForcedAppOrientation="); pw.print(mForcedAppOrientation);
                     pw.print(", mRequestedRotation="); pw.println(mRequestedRotation);
             pw.print("  mDeferredRotation="); pw.print(mDeferredRotation);
-                    pw.print(", mDeferredRotationAnimFlags="); pw.print(mDeferredRotationAnimFlags);
+                    pw.print(", mDeferredRotationAnimFlags="); pw.println(mDeferredRotationAnimFlags);
             pw.print("  mAnimationPending="); pw.print(mAnimationPending);
                     pw.print(" mWindowAnimationScale="); pw.print(mWindowAnimationScale);
                     pw.print(" mTransitionWindowAnimationScale="); pw.println(mTransitionAnimationScale);
             pw.print("  mNextAppTransition=0x");
                     pw.print(Integer.toHexString(mNextAppTransition));
-                    pw.print(", mAppTransitionReady="); pw.print(mAppTransitionReady);
-                    pw.print(", mAppTransitionRunning="); pw.print(mAppTransitionRunning);
-                    pw.print(", mAppTransitionTimeout="); pw.println( mAppTransitionTimeout);
+                    pw.print(" mAppTransitionReady="); pw.println(mAppTransitionReady);
+            pw.print("  mAppTransitionRunning="); pw.print(mAppTransitionRunning);
+                    pw.print(" mAppTransitionTimeout="); pw.println( mAppTransitionTimeout);
             if (mNextAppTransitionPackage != null) {
                 pw.print("  mNextAppTransitionPackage=");
                     pw.print(mNextAppTransitionPackage);
-                    pw.print(", mNextAppTransitionEnter=0x");
+                    pw.print(" mNextAppTransitionEnter=0x");
                     pw.print(Integer.toHexString(mNextAppTransitionEnter));
-                    pw.print(", mNextAppTransitionExit=0x");
+                    pw.print(" mNextAppTransitionExit=0x");
                     pw.print(Integer.toHexString(mNextAppTransitionExit));
             }
             pw.print("  mStartingIconInTransition="); pw.print(mStartingIconInTransition);