From 0fb158a685d753682afdcffb0b783be8e38e0f2b Mon Sep 17 00:00:00 2001 From: Danielle Millett Date: Fri, 30 Sep 2011 13:49:14 -0400 Subject: [PATCH] Reorganized the biometric weak check functions Moved isBiometricSensorAvailable functionality into isBiometricWeakInstalled (formerly called isBiometricEnabled). Settings now only shows biometric weak if it's installed, if it's not installed and the lock type is currently set to biometric weak, the backup lock is shown as being set instead. Change-Id: Icfe326a6598df33ee60d5fdc024273d94f115983 --- src/com/android/settings/ChooseLockGeneric.java | 9 ++------- src/com/android/settings/SecuritySettings.java | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 9301a8662f3..d589aa3d297 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -22,7 +22,6 @@ import android.app.admin.DevicePolicyManager; 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 @@ public class ChooseLockGeneric extends PreferenceActivity { 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 @@ public class ChooseLockGeneric extends PreferenceActivity { 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); diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 5b8035dbc98..60233899c58 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -106,7 +106,8 @@ public class SecuritySettings extends SettingsPreferenceFragment } 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()) {