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

Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev

Browse Source 
am: 72c216f

* commit '72c216f25072123f498105bc7ad98a65a7a3cdaf':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: I33795a8690e52d26b6f66f991b03b16bdeb665f4
This commit is contained in:
Wale Ogunwale
2016-04-26 02:27:20 +00:00
committed by android-build-merger
parent 821bbc186f 72c216f250
commit c8cd9483ea
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/policy/PhoneWindowManager.java
View File

@@ -4912,7 +4912,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
if (mWinShowWhenLocked != null &&
if (!mKeyguardHidden && mWinShowWhenLocked != null &&
mWinShowWhenLocked.getAppToken() != win.getAppToken() &&
(attrs.flags & FLAG_SHOW_WHEN_LOCKED) == 0) {
win.hideLw(false);