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

Merge "Default to PASSWORD_QUALITY_UNSPECIFIED"

Browse Source
This commit is contained in:
Jim Miller
2014-04-15 23:13:23 +00:00
committed by Android (Google) Code Review
parent a17bfe04a7 431207343f
commit 4c4fc3e172
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,13 +788,13 @@ public class LockPatternUtils {
*/ */
public int getKeyguardStoredPasswordQuality() { public int getKeyguardStoredPasswordQuality() {
int quality = int quality =
(int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); (int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
// If the user has chosen to use weak biometric sensor, then return the backup locking // If the user has chosen to use weak biometric sensor, then return the backup locking
// method and treat biometric as a special case. // method and treat biometric as a special case.
if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) { if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
quality = quality =
(int) getLong(PASSWORD_TYPE_ALTERNATE_KEY, (int) getLong(PASSWORD_TYPE_ALTERNATE_KEY,
DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
} }
return quality; return quality;
} }
@@ -804,7 +804,7 @@ public class LockPatternUtils {
*/ */
public boolean usingBiometricWeak() { public boolean usingBiometricWeak() {
int quality = int quality =
(int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); (int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
return quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK; return quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;
} }
@@ -943,11 +943,12 @@ public class LockPatternUtils {
*/ */
public boolean isLockPatternEnabled() { public boolean isLockPatternEnabled() {
final boolean backupEnabled = final boolean backupEnabled =
getLong(PASSWORD_TYPE_ALTERNATE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) getLong(PASSWORD_TYPE_ALTERNATE_KEY,
== DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
== DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
return getBoolean(Settings.Secure.LOCK_PATTERN_ENABLED, false) return getBoolean(Settings.Secure.LOCK_PATTERN_ENABLED, false)
&& (getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) && (getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
== DevicePolicyManager.PASSWORD_QUALITY_SOMETHING || == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING ||
(usingBiometricWeak() && backupEnabled)); (usingBiometricWeak() && backupEnabled));
} }