diff options
| author | Brian Colonna <bcolonna@google.com> | 2011-10-13 20:03:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 20:03:55 -0700 |
| commit | 04169673b50dd9f16a6f53af089c702d66eb8009 (patch) | |
| tree | 6526511bf0e3adb561f5f643e0cd2d3c04575ff0 | |
| parent | bc82c349f1c3cd0c0340c61f876ed5af518b11f7 (diff) | |
| parent | 2ce6882bb498c93af114626daa79cfa4f3f4e366 (diff) | |
| download | frameworks_base-04169673b50dd9f16a6f53af089c702d66eb8009.zip frameworks_base-04169673b50dd9f16a6f53af089c702d66eb8009.tar.gz frameworks_base-04169673b50dd9f16a6f53af089c702d66eb8009.tar.bz2 | |
am 2ce6882b: Fixed problem where Face Unlock area was showing
* commit '2ce6882bb498c93af114626daa79cfa4f3f4e366':
Fixed problem where Face Unlock area was showing
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 10 |
1 files 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 c3f6767..75f4199 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(); } |