commit 3406886939b0f28c426acefbe9dc77292210d8b4
author Steven Ross <stross@google.com> Thu Oct 13 21:02:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 21:02:15 2011 -0700
tree 769fb51235bb22f0115085379875b6db58af94ad
parent 2ce6882bb498c93af114626daa79cfa4f3f4e366
parent 7726289c2890d13baa3d10dc504b43e2128b4918

Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index 3474f0cf7..80275b1 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -338,7 +338,10 @@
                 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()
@@ -537,7 +540,10 @@
             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();
         }