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

resolve merge conflicts of 2755644 to lmp-mr1-ub-dev.

Browse Source 
Change-Id: I01920b0dc8185d8efb9431bfad911e4733b43e1d
This commit is contained in:
Wale Ogunwale
2014-11-12 12:46:45 -08:00
parent e9e96e7f0e 2755644d32
commit 89b3ecc7b3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -333,10 +333,11 @@ public class WindowAnimator {
+ " hidden=" + win.mRootToken.hidden + " hidden=" + win.mRootToken.hidden
+ " anim=" + win.mWinAnimator.mAnimation); + " anim=" + win.mWinAnimator.mAnimation);
} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
final boolean hideWhenLocked = !((win.mIsImWindow && showImeOverKeyguard) || final boolean hideWhenLocked =
(appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken || !(((win.mIsImWindow || imeTarget == win) && showImeOverKeyguard)
// Show error dialogs over apps that dismiss keyguard. || (appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken ||
(win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0))); // Show error dialogs over apps that dismiss keyguard.
(win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0)));
if (((mForceHiding == KEYGUARD_ANIMATING_IN) if (((mForceHiding == KEYGUARD_ANIMATING_IN)
&& (!winAnimator.isAnimating() || hideWhenLocked)) && (!winAnimator.isAnimating() || hideWhenLocked))
|| ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) { || ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {