commit b684251e8f1e85ea9483af2b80bc92f0fd8ded1c
author Mike Lockwood <lockwood@android.com> Wed Dec 02 01:15:27 2009 -0500
committer Mike Lockwood <lockwood@android.com> Wed Dec 02 01:56:13 2009 -0500
tree 9b60603a9494cef9883f4d8fe5fa5b7a6bb49ab4
parent b64c72dfb3e635093b00690454cb905ffff68ab9

Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.

Fixes b/2297221 ('Add call' button has no action, if call is answered on lockpattern screen)

Change-Id: I6df8f64dedc4d2d8b02f746213c7b1b336d6560e
Signed-off-by: Mike Lockwood <lockwood@android.com>

phone/com/android/internal/policy/impl/KeyguardViewMediator.java

diff --git a/phone/com/android/internal/policy/impl/KeyguardViewMediator.java b/phone/com/android/internal/policy/impl/KeyguardViewMediator.java
index 6b9db60..17586be 100644
--- a/phone/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/phone/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -170,7 +170,7 @@
     // these are protected by synchronized (this)
 
     /**
-     * External apps (like the phone app) can tell us to disable the keygaurd.
+     * This is set to false if the keyguard is disabled via setKeyguardEnabled(false).
      */
     private boolean mExternallyEnabled = true;
 
@@ -398,15 +398,31 @@
                 // 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();