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
This commit is contained in:
TreeHugger Robot
2016-04-26 02:21:16 +00:00
committed by Android (Google) Code Review
parent d6a3949588 23fd1db68d
commit 72c216f250
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() && mWinShowWhenLocked.getAppToken() != win.getAppToken() &&
(attrs.flags & FLAG_SHOW_WHEN_LOCKED) == 0) { (attrs.flags & FLAG_SHOW_WHEN_LOCKED) == 0) {
win.hideLw(false); win.hideLw(false);