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

Craig Mautner · Android (Google) Code Review · commit ab1c5456b789 · 2012-05-11T16:07:10.000-07:00
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java
@@ -269,7 +269,7 @@ private void updateWindowsAndWallpaperLocked() {
                                 mPendingLayoutChanges);
                         }
                         mService.mFocusMayChange = true;
-                    } else if (win.isReadyForDisplay() && winAnimator.mAnimation == null) {
+                    } else if (win.isReadyForDisplay()) {
                         mForceHiding = true;
                     }
                 } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ private void updateWindowsAndWallpaperLocked() {`
`269`	`269`	`mPendingLayoutChanges);`
`270`	`270`	`}`
`271`	`271`	`mService.mFocusMayChange = true;`
`272`		`- } else if (win.isReadyForDisplay() && winAnimator.mAnimation == null) {`
	`272`	`+ } else if (win.isReadyForDisplay()) {`
`273`	`273`	`mForceHiding = true;`
`274`	`274`	`}`
`275`	`275`	`} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {`