From 2ce6882bb498c93af114626daa79cfa4f3f4e366 Mon Sep 17 00:00:00 2001 From: Brian Colonna Date: Thu, 13 Oct 2011 22:43:28 -0400 Subject: [PATCH] Fixed problem where Face Unlock area was showing I introduced a bug cl https://android-git.corp.google.com/g/#/c/141926 that caused black box to hide lock pattern even when not using Face Unlock. Fixed by adding the corresponding check to make sure Face Unlock is being used. Change-Id: I9c429c99d7db4d1ab831080f23a1e10123dbfe3e --- .../internal/policy/impl/LockPatternKeyguardView.java | 10 ++++++++-- 1 file changed, 8 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 c3f67675322cc..75f4199de427b 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -337,7 +337,10 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler stopAndUnbindFromFaceLock(); // Continue showing FaceLock area until dialer comes up - showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT); + if (mLockPatternUtils.usingBiometricWeak() && + mLockPatternUtils.isBiometricWeakInstalled()) { + showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT); + } pokeWakelock(EMERGENCY_CALL_TIMEOUT); if (TelephonyManager.getDefault().getCallState() @@ -538,7 +541,10 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler bindToFaceLock(); // Show FaceLock area, but only for a little bit so lockpattern will become visible if // FaceLock fails to start or crashes - showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT); + if (mLockPatternUtils.usingBiometricWeak() && + mLockPatternUtils.isBiometricWeakInstalled()) { + showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT); + } } else { hideFaceLockArea(); }