am 2ce6882: Fixed problem where Face Unlock area was showing

* commit '2ce6882bb498c93af114626daa79cfa4f3f4e366':
  Fixed problem where Face Unlock area was showing

Author: Brian Colonna

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

@@ -337,7 +337,10 @@ public void takeEmergencyCallAction() {
                 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 @@ private void activateFaceLockIfAble() {
             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();
         }