commit 02771bcb5d2156a58b825a5f8132fdf575ea862d
author Dianne Hackborn Wed Mar 25 22:39:21 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 25 22:39:21 2009 -0700
tree 92ef9f6935070011dcdafb4d4bad6a853a0f619f
parent ffacbe5d36a6dec96a5c18081c4c321145f9fb66

Automated import from //branches/cupcake/...@142870,142870

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

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 19ab21d8..48cbf99 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -2166,7 +2166,7 @@
             
             if (changed) {
                 changed = setRotationUncheckedLocked(
-                        WindowManagerPolicy.USE_LAST_ROTATION);
+                        WindowManagerPolicy.USE_LAST_ROTATION, 1);
                 if (changed) {
                     if (freezeThisOneIfNeeded != null) {
                         AppWindowToken wtoken = findAppWindowToken(
@@ -3258,7 +3258,7 @@
         mPolicy.enableScreenAfterBoot();
         
         // Make sure the last requested orientation has been applied.
-        setRotationUnchecked(WindowManagerPolicy.USE_LAST_ROTATION, false);
+        setRotationUnchecked(WindowManagerPolicy.USE_LAST_ROTATION, false, 0);
     }
     
     public void setInTouchMode(boolean mode) {
@@ -3268,23 +3268,24 @@
     }
 
     public void setRotation(int rotation, 
-            boolean alwaysSendConfiguration) {
+            boolean alwaysSendConfiguration, int animFlags) {
         if (!checkCallingPermission(android.Manifest.permission.SET_ORIENTATION,
-                "setOrientation()")) {
+                "setRotation()")) {
             return;
         }
 
-        setRotationUnchecked(rotation, alwaysSendConfiguration);
+        setRotationUnchecked(rotation, alwaysSendConfiguration, animFlags);
     }
     
-    public void setRotationUnchecked(int rotation, boolean alwaysSendConfiguration) {
+    public void setRotationUnchecked(int rotation,
+            boolean alwaysSendConfiguration, int animFlags) {
         if(DEBUG_ORIENTATION) Log.v(TAG,
                 "alwaysSendConfiguration set to "+alwaysSendConfiguration);
         
         long origId = Binder.clearCallingIdentity();
         boolean changed;
         synchronized(mWindowMap) {
-            changed = setRotationUncheckedLocked(rotation);
+            changed = setRotationUncheckedLocked(rotation, animFlags);
         }
         
         if (changed) {
@@ -3301,7 +3302,7 @@
         Binder.restoreCallingIdentity(origId);
     }
     
-    public boolean setRotationUncheckedLocked(int rotation) {
+    public boolean setRotationUncheckedLocked(int rotation, int animFlags) {
         boolean changed;
         if (rotation == WindowManagerPolicy.USE_LAST_ROTATION) {
             rotation = mRequestedRotation;
@@ -3326,6 +3327,7 @@
             mH.sendMessageDelayed(mH.obtainMessage(H.WINDOW_FREEZE_TIMEOUT),
                     2000);
             startFreezingDisplayLocked();
+            Log.i(TAG, "Setting rotation to " + rotation + ", animFlags=" + animFlags);
             mQueue.setOrientation(rotation);
             if (mDisplayEnabled) {
                 Surface.setOrientation(0, rotation);
@@ -6976,7 +6978,6 @@
         public static final int REMOVE_STARTING = 6;
         public static final int FINISHED_STARTING = 7;
         public static final int REPORT_APPLICATION_TOKEN_WINDOWS = 8;
-        public static final int UPDATE_ORIENTATION = 10;
         public static final int WINDOW_FREEZE_TIMEOUT = 11;
         public static final int HOLD_SCREEN_CHANGED = 12;
         public static final int APP_TRANSITION_TIMEOUT = 13;
@@ -7204,11 +7205,6 @@
                     }
                 } break;
                 
-                case UPDATE_ORIENTATION: {
-                    setRotationUnchecked(WindowManagerPolicy.USE_LAST_ROTATION, false);
-                    break;
-                }
-                
                 case WINDOW_FREEZE_TIMEOUT: {
                     synchronized (mWindowMap) {
                         Log.w(TAG, "Window freeze timeout expired.");