Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 5185505: allow facelock to be enabled by a setting."

Browse Source
This commit is contained in:
Jim Miller
2011-10-03 22:00:03 -07:00
committed by Android (Google) Code Review
parent c04db7e067 cb3521e3bb
commit ebccf3c2c8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -59,6 +59,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/ */
public class LockPatternUtils { public class LockPatternUtils {
private static final String OPTION_ENABLE_FACELOCK = "enable_facelock";
private static final String TAG = "LockPatternUtils"; private static final String TAG = "LockPatternUtils";
private static final String SYSTEM_DIRECTORY = "/system/"; private static final String SYSTEM_DIRECTORY = "/system/";
@@ -114,6 +116,7 @@ public class LockPatternUtils {
public static final String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate"; public static final String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate";
private final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt"; private final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt";
private final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled"; private final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled";
private final static String LOCKSCREEN_OPTIONS = "lockscreen.options";
public final static String LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK public final static String LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK
= "lockscreen.biometric_weak_fallback"; = "lockscreen.biometric_weak_fallback";
@@ -839,7 +842,7 @@ public class LockPatternUtils {
*/ */
public boolean isBiometricWeakInstalled() { public boolean isBiometricWeakInstalled() {
// Check that the system flag was set // Check that the system flag was set
if (!SystemProperties.getBoolean("ro.lockscreen.facelock_enabled", false)) { if (!OPTION_ENABLE_FACELOCK.equals(getString(LOCKSCREEN_OPTIONS))) {
return false; return false;
} }