summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2012-03-16 15:35:21 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-16 15:35:21 -0700
commitd87eb6c7c686182aaf0e7dd6facacb9e229f9684 (patch)
tree205ebc25b2cd0bd7197017b4a457d81f4140a63e
parent9e4fdfae11b921b57d5e12cbc1ad0fbc8daab41e (diff)
parent0059d3508f3c5346d4ea07d4ada3e1827e4c8a01 (diff)
Merge "Fix black screen on app transition."
-rw-r--r--services/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index f4c4069e3c33..69936577e57b 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -7688,9 +7688,9 @@ public class WindowManagerService extends IWindowManager.Stub
Surface.openTransaction();
try {
+ updateWindowsAppsAndRotationAnimationsLocked(currentTime, innerDw, innerDh);
mPendingLayoutChanges = performAnimationsLocked(currentTime, dw, dh,
innerDw, innerDh);
- updateWindowsAppsAndRotationAnimationsLocked(currentTime, innerDw, innerDh);
// THIRD LOOP: Update the surfaces of all windows.