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

am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

Browse Source 
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
  Fix FLAG_DISMISS_KEYGUARD not working
This commit is contained in:
Craig Mautner
2014-04-01 19:43:41 +00:00
committed by Android Git Automerger
parent e0b94d1cf1 d1c82f8fc2
commit efbe7cc0ff
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

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