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

Author: Brian Colonna

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

@@ -358,15 +358,16 @@ public void recreateMe(Configuration config) {
 
             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) {