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

am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev

Browse Source 
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
  Fix FLAG_DISMISS_KEYGUARD not working
This commit is contained in:
Craig Mautner
2014-04-01 21:48:04 +00:00
committed by Android Git Automerger
parent 17bbd976c0 c70f15fe29
commit 2b6fe2990d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3420,8 +3420,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());
@@ -3438,10 +3439,8 @@ 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;
mWinDismissingKeyguard = win; mWinDismissingKeyguard = win;