Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2012-05-11 16:07:10 -07:00
committed by Android (Google) Code Review
parent 6788e028c3 35d0e1d11c
commit ab1c5456b7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -269,7 +269,7 @@ public class WindowAnimator {
mPendingLayoutChanges); mPendingLayoutChanges);
} }
mService.mFocusMayChange = true; mService.mFocusMayChange = true;
} else if (win.isReadyForDisplay() && winAnimator.mAnimation == null) { } else if (win.isReadyForDisplay()) {
mForceHiding = true; mForceHiding = true;
} }
} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {