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

Merge "Should read specific user\'s password restriction" into nyc-dev

Browse Source 
am: 2bfbcfa

* commit '2bfbcfae13afd00b7e7e28031a9bda5f7de753f8':
  Should read specific user's password restriction
This commit is contained in:
Tony Mak
2016-03-18 18:54:45 +00:00
committed by android-build-merger
parent b03e5ece2d 2bfbcfae13
commit d1af8c2d6a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -393,7 +393,7 @@ public class ChooseLockGeneric extends SettingsActivity {
private int upgradeQualityForDPM(int quality) { private int upgradeQualityForDPM(int quality) {
// Compare min allowed password quality // Compare min allowed password quality
int minQuality = mDPM.getPasswordQuality(null); int minQuality = mDPM.getPasswordQuality(null, mUserId);
if (quality < minQuality) { if (quality < minQuality) {
quality = minQuality; quality = minQuality;
} }
@@ -422,7 +422,7 @@ public class ChooseLockGeneric extends SettingsActivity {
boolean hideDisabled) { boolean hideDisabled) {
final PreferenceScreen entries = getPreferenceScreen(); final PreferenceScreen entries = getPreferenceScreen();
int adminEnforcedQuality = mDPM.getPasswordQuality(null); int adminEnforcedQuality = mDPM.getPasswordQuality(null, mUserId);
EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet( EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
getActivity(), mUserId); getActivity(), mUserId);
for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) { for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
@@ -592,7 +592,7 @@ public class ChooseLockGeneric extends SettingsActivity {
Intent intent = null; Intent intent = null;
final Context context = getActivity(); final Context context = getActivity();
if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) { if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
int minLength = mDPM.getPasswordMinimumLength(null); int minLength = mDPM.getPasswordMinimumLength(null, mUserId);
if (minLength < MIN_PASSWORD_LENGTH) { if (minLength < MIN_PASSWORD_LENGTH) {
minLength = MIN_PASSWORD_LENGTH; minLength = MIN_PASSWORD_LENGTH;
} }