diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-11 16:07:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 16:07:10 -0700 |
| commit | ab1c5456b789205ef305b19e5a7682b6561aacac (patch) | |
| tree | 8299759c0e011a237e0dc762f08343b167090c6f | |
| parent | 6788e028c363583406d513d66d9a78576f984302 (diff) | |
| parent | 35d0e1d11c046b5e5ddf6d12c1a09becb8561af0 (diff) | |
| download | frameworks_base-ab1c5456b789205ef305b19e5a7682b6561aacac.zip frameworks_base-ab1c5456b789205ef305b19e5a7682b6561aacac.tar.gz frameworks_base-ab1c5456b789205ef305b19e5a7682b6561aacac.tar.bz2 | |
Merge "Keep launcher screen from flashing over lockscreen" into jb-dev
| -rw-r--r-- | services/java/com/android/server/wm/WindowAnimator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 146de34..480992b 100644 --- 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)) { |