commit dd98ff192cb0170927f58645591ac2d54d34cc65
author Danielle Millett <dmillett@google.com> Mon Oct 03 17:38:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 03 17:38:41 2011 -0700
tree a8fc5ed6d2221e1471669c1fd47add7478376d83
parent 326f96c5dca3ad59f9a96326e882eaa55cc7d560
parent 0fb158a685d753682afdcffb0b783be8e38e0f2b

Merge "Reorganized the biometric weak check functions"

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 9301a86..d589aa3 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -22,7 +22,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
@@ -231,8 +230,8 @@
             final PreferenceScreen entries = getPreferenceScreen();
             final boolean onlyShowFallback = getActivity().getIntent()
                     .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-            final boolean weakBiometricAvailable = isBiometricSensorAvailable(
-                    DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
+            final boolean weakBiometricAvailable =
+                    mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
             for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
                 Preference pref = entries.getPreference(i);
                 if (pref instanceof PreferenceScreen) {
@@ -275,10 +274,6 @@
                     KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key);
         }
 
-        private boolean isBiometricSensorAvailable(int quality) {
-            return SystemProperties.getBoolean("ro.lockscreen.facelock_enabled", false);
-        }
-
         private Intent getBiometricSensorIntent(int quality) {
             Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
             fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5b8035d..6023389 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -106,7 +106,8 @@
             } else {
                 resid = R.xml.security_settings_chooser;
             }
-        } else if (mLockPatternUtils.usingBiometricWeak()) {
+        } else if (mLockPatternUtils.usingBiometricWeak() &&
+                mLockPatternUtils.isBiometricWeakInstalled()) {
             resid = R.xml.security_settings_biometric_weak;
         } else {
             switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {