commit 842f0f45391335cd39a4bc2541ee2e057781ac68
author Brian Colonna <bcolonna@google.com> Tue Oct 25 05:43:37 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 25 05:43:37 2011 -0700
tree b91cab73fe78614f413a2f34ea88919f9a140b14
parent 763480fbcabedfc2f425484ed74bc1e2e1392176
parent 1a088aa1b9350681edcf1a94f54e45debd7eca15

Merge "Fix 5479823: black patch was showing before resuming call" into ics-mr0

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index f6ec414..81e1901 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -358,15 +358,16 @@
 
             public void takeEmergencyCallAction() {
                 mHasOverlay = true;
-                // FaceLock must be stopped if it is running when emergency call is pressed
-                stopAndUnbindFromFaceLock();
 
-                // Continue showing FaceLock area until dialer comes up
+                // Continue showing FaceLock area until dialer comes up or call is resumed
                 if (mLockPatternUtils.usingBiometricWeak() &&
-                        mLockPatternUtils.isBiometricWeakInstalled()) {
+                        mLockPatternUtils.isBiometricWeakInstalled() && mFaceLockServiceRunning) {
                     showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);
                 }
 
+                // FaceLock must be stopped if it is running
+                stopAndUnbindFromFaceLock();
+
                 pokeWakelock(EMERGENCY_CALL_TIMEOUT);
                 if (TelephonyManager.getDefault().getCallState()
                         == TelephonyManager.CALL_STATE_OFFHOOK) {