Merge "Revert change to correct animations." into jb-dev

2012-06-03 00:57:23 -07:00
parent 1f3c11b795 3aa7fcac1c
commit da652f6e51
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8078,7 +8078,7 @@ public class WindowManagerService extends IWindowManager.Stub
                }
                if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
                        "New transit: " + transit);
-            } else if ((oldWallpaper != null) && (oldWallpaper != mWallpaperTarget)) {
+            } else if (oldWallpaper != null) {
                // We are transitioning from an activity with
                // a wallpaper to one without.
                transit = WindowManagerPolicy.TRANSIT_WALLPAPER_CLOSE;