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

am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

Browse Source 
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working
This commit is contained in:
Craig Mautner
2014-04-01 19:24:23 +00:00
committed by Android Git Automerger
parent 3bc9971d70 7bd0b65233
commit fc80fbe3d5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -2989,8 +2989,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;
final boolean dismissKeyguard = (attrs.flags & FLAG_DISMISS_KEYGUARD) != 0;
if (appWindow) {
if (showWhenLocked) {
if (showWhenLocked || (dismissKeyguard && !isKeyguardSecure())) {
mAppsToBeHidden.remove(win.getAppToken());
} else {
mAppsToBeHidden.add(win.getAppToken());
@@ -3006,8 +3007,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mHideLockScreen = true;
mForceStatusBarFromKeyguard = false;
}
if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0
&& mDismissKeyguard == DISMISS_KEYGUARD_NONE) {
if (dismissKeyguard && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {
if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mDismissKeyguard true by win " + win);
mDismissKeyguard = mWinDismissingKeyguard == win ?
DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;