From 35d0e1d11c046b5e5ddf6d12c1a09becb8561af0 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Fri, 11 May 2012 11:50:58 -0700 Subject: [PATCH] Keep launcher screen from flashing over lockscreen Extend the force hide period to include the animation. Fixes bug b6471929. Change-Id: I91daf9dc678723be4c69913aa5a3aa0e265d103e --- services/java/com/android/server/wm/WindowAnimator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 146de34f50fe4..480992beaa150 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)) {