diff options
| author | Craig Mautner <cmautner@google.com> | 2012-06-03 00:59:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-03 00:59:17 -0700 |
| commit | 547be2fc329c5d8e3fca38cbf17ee32d0e788ac9 (patch) | |
| tree | e7dffbed41cab20d313247e6ea186f8025ee037c | |
| parent | 0962d3729bc241f23bb2adbd066b46caa28db12d (diff) | |
| parent | da652f6e51e5b255019ac020d56e262e477c2a46 (diff) | |
| download | frameworks_base-547be2fc329c5d8e3fca38cbf17ee32d0e788ac9.zip frameworks_base-547be2fc329c5d8e3fca38cbf17ee32d0e788ac9.tar.gz frameworks_base-547be2fc329c5d8e3fca38cbf17ee32d0e788ac9.tar.bz2 | |
am da652f6e: Merge "Revert change to correct animations." into jb-dev
* commit 'da652f6e51e5b255019ac020d56e262e477c2a46':
Revert change to correct animations.
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 2 |
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 efbf0d4..2053299 100755 --- 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; |