From 6e6e5df754bb6f41a37500d5b1c45329a37ca326 Mon Sep 17 00:00:00 2001 From: Brian Colonna Date: Tue, 6 Dec 2011 10:04:38 -0500 Subject: Making Face Unlock fix that wasn't proerly merged in master It appears that https://android-git.corp.google.com/g/#/c/144795/1 was incorrectly merged down into master. This commit is to correctly add the change from that cl into the master branch. Without this change, if you bring up the emergency dialer while Face Unlock is running, you momentarily see the backup lock. Change-Id: I6350150bf46ac52d5c50c9e88119f09397d22902 --- .../com/android/internal/policy/impl/LockPatternKeyguardView.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index 7e48357ced93..67a6855d8b61 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -366,14 +366,15 @@ 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 or call is resumed if (usingFaceLock() && mFaceLockServiceRunning) { showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT); } + // FaceLock must be stopped if it is running when emergency call is pressed + stopAndUnbindFromFaceLock(); + pokeWakelock(EMERGENCY_CALL_TIMEOUT); if (TelephonyManager.getDefault().getCallState() == TelephonyManager.CALL_STATE_OFFHOOK) { -- cgit v1.2.3-59-g8ed1b