summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Colonna <bcolonna@google.com>2011-10-24 17:15:52 -0400
committerBrian Colonna <bcolonna@google.com>2011-10-24 17:15:52 -0400
commit1a088aa1b9350681edcf1a94f54e45debd7eca15 (patch)
tree11221c5609fd501110600597d3ea32a073ac15b1
parentc9c417c85d08074e5ececd5c74db1364e9c097c2 (diff)
downloadframeworks_base-1a088aa1b9350681edcf1a94f54e45debd7eca15.zip
frameworks_base-1a088aa1b9350681edcf1a94f54e45debd7eca15.tar.gz
frameworks_base-1a088aa1b9350681edcf1a94f54e45debd7eca15.tar.bz2
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
-rw-r--r--policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java9
1 files 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 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 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) {