PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove password blacklist check" into pi-dev am: 48283ec44c

Browse Source 
am: d982a37476

Change-Id: I0c90b8cfb3dbec57cac00c55666e79dd0d32fc90
This commit is contained in:
Rubin Xu
2018-03-30 18:24:21 +00:00
committed by android-build-merger
parent ffddcf0c95 d982a37476
commit 228246d47f
2 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -241,7 +241,6 @@ public class ChooseLockPassword extends SettingsActivity {
static final int NOT_ENOUGH_DIGITS = 1 << 9;
static final int NOT_ENOUGH_SYMBOLS = 1 << 10;
static final int NOT_ENOUGH_NON_LETTER = 1 << 11;
static final int BLACKLISTED = 1 << 12;
/**
* Keep track internally of where the user is in choosing a pattern.
@@ -728,16 +727,6 @@ public class ChooseLockPassword extends SettingsActivity {
}
}
// Only check the blacklist if the password is otherwise valid. Checking the blacklist
// can be expensive and it is not useful to report the fact it is on a blacklist if it
// couldn't be set anyway.
if (errorCode == NO_ERROR) {
if (mLockPatternUtils.getDevicePolicyManager()
.isPasswordBlacklisted(mUserId, password)) {
errorCode |= BLACKLISTED;
}
}
return errorCode;
}
@@ -856,11 +845,6 @@ public class ChooseLockPassword extends SettingsActivity {
messages.add(getString((mIsAlphaMode) ? R.string.lockpassword_password_recently_used
: R.string.lockpassword_pin_recently_used));
}
if ((errorCode & BLACKLISTED) > 0) {
messages.add(getString((mIsAlphaMode)
? R.string.lockpassword_password_blacklisted_by_admin
: R.string.lockpassword_pin_blacklisted_by_admin));
}
return messages.toArray(new String[0]);
}