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

2016-04-26 02:21:16 +00:00
parent d6a3949588 23fd1db68d
commit 72c216f250
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -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);