diff options
| author | Brian Colonna <bcolonna@google.com> | 2011-12-06 07:25:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-06 07:25:59 -0800 |
| commit | 4f102ea7865737c2a17f261c7efa4c06aee9c87a (patch) | |
| tree | 6a74244d38557175a40284f248ebf414add7d0aa /policy | |
| parent | 4a3d5b04daa74dc3bd5084b3395892b5565e6288 (diff) | |
| parent | 6e6e5df754bb6f41a37500d5b1c45329a37ca326 (diff) | |
| download | frameworks_base-4f102ea7865737c2a17f261c7efa4c06aee9c87a.zip frameworks_base-4f102ea7865737c2a17f261c7efa4c06aee9c87a.tar.gz frameworks_base-4f102ea7865737c2a17f261c7efa4c06aee9c87a.tar.bz2 | |
Merge "Making Face Unlock fix that wasn't proerly merged in master"
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 5 |
1 files 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 7e48357..67a6855 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) { |