Merge "Keep launcher screen from flashing over lockscreen" into jb-dev

2012-05-11 16:07:10 -07:00
parent 6788e028c3 35d0e1d11c
commit ab1c5456b7
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -269,7 +269,7 @@ public class WindowAnimator {
                                mPendingLayoutChanges);
                        }
                        mService.mFocusMayChange = true;
-                    } else if (win.isReadyForDisplay() && winAnimator.mAnimation == null) {
+                    } else if (win.isReadyForDisplay()) {
                        mForceHiding = true;
                    }
                } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {