From 1a088aa1b9350681edcf1a94f54e45debd7eca15 Mon Sep 17 00:00:00 2001 From: Brian Colonna Date: Mon, 24 Oct 2011 17:15:52 -0400 Subject: [PATCH] Fix 5479823: black patch was showing before resuming call - This issue was marked as RelTeamHotIssue - When Face Unlock is enabled, the black area is shown when going into the emergency dialer to prevent the backup lock from showing. However, it was doing this even if Face Unlock has already gone to the backup method. - Since the same code is used for returning to a call as is used for starting the emergency dialer, it was doing the same thing when resuming a call. - Just had to add a simple check to only display the black area if Face Unlock is still running. - Note that this did *not* cause a problem when Face Unlock was not the unlock method. Change-Id: Icc4deebcb47ceda035ea29c7d976342d3a8a60a7 --- .../internal/policy/impl/LockPatternKeyguardView.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index f6ec4140bf43f..81e1901f398ae 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 class LockPatternKeyguardView extends KeyguardViewBase implements Handler 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) {