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

* commit 'ab1c5456b789205ef305b19e5a7682b6561aacac':
  Keep launcher screen from flashing over lockscreen
This commit is contained in:
Craig Mautner
2012-05-11 16:09:31 -07:00
committed by Android Git Automerger

View File

@@ -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)) {