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

am 7da9d7aa: Merge "apply force hiding of window only when it is main display" into mnc-dev

Browse Source 
* commit '7da9d7aa52751434ee869ccd6a1e71d2a9b7f5cd':
  apply force hiding of window only when it is main display
This commit is contained in:
keunyoung
2015-06-08 20:21:15 +00:00
committed by Android Git Automerger
parent 48f193a859 7da9d7aa52
commit b7ee0ba43b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,7 +208,7 @@ public class WindowAnimator {
// Only hide windows if the keyguard is active and not animating away.
boolean keyguardOn = mPolicy.isKeyguardShowingOrOccluded()
&& mForceHiding != KEYGUARD_ANIMATING_OUT;
return keyguardOn && hideWhenLocked;
return keyguardOn && hideWhenLocked && (win.getDisplayId() == Display.DEFAULT_DISPLAY);
}
private void updateWindowsLocked(final int displayId) {