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

am 6f277195: am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."

Browse Source 
Merge commit '6f277195b9434c516facd33f684223a7639de0c5' into eclair-mr2-plus-aosp

* commit '6f277195b9434c516facd33f684223a7639de0c5':
  Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
This commit is contained in:
Mike Lockwood
2009-12-02 11:41:17 -08:00
committed by Android Git Automerger
parent cfbd6fd29d 2f8a5cd29f
commit 990f565ae5
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
policy/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -172,7 +172,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
// these are protected by synchronized (this)
/**
* This is set to false if the keyguard is disabled via setKeyguardEnabled(false).
* External apps (like the phone app) can tell us to disable the keygaurd.
*/
private boolean mExternallyEnabled = true;
@@ -400,31 +400,15 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
// don't allow this api when the device isn't provisioned
if (DEBUG) Log.d(TAG, "ignoring because device isn't provisioned");
callback.onKeyguardExitResult(false);
} else if (mExternallyEnabled) {
// this only applies when the user has externally disabled the
// keyguard. this is unexpected and means the user is not
// using the api properly.
Log.w(TAG, "verifyUnlock called when not externally disabled");
callback.onKeyguardExitResult(false);
} else if (mExitSecureCallback != null) {
// already in progress with someone else
callback.onKeyguardExitResult(false);
} else if (mExternallyEnabled) {
if (mHidden) {
if (isSecure()) {
// if the current activity is in front of the keyguard, then
// pretend like we succeeded and we will hit the lock screen
// when the activity is launched.
// HACK ALERT - this is assuming that the callback will be used
// to start a new activity (current usage by Phone app).
callback.onKeyguardExitResult(true);
} else {
// call through to verifyUnlockLocked() so we can bypass
// the insecure keyguard screen.
mExitSecureCallback = callback;
verifyUnlockLocked();
}
} else {
// this only applies when the user has externally disabled the keyguard
// and no other activities are in front of the keyguard.
// this is unexpected and means the user is not using the api properly.
Log.w(TAG, "verifyUnlock called when not externally disabled");
callback.onKeyguardExitResult(false);
}
} else {
mExitSecureCallback = callback;
verifyUnlockLocked();