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

Credential storage: check lock quality for right user

Browse Source 
Checking the wrong user can lead to an infinite loop when trying to
install credentials from a managed profile.

Bug: 28043334
Change-Id: I3e1044069f0d5139a47de461996a6d98e0fe5e2f
This commit is contained in:
Robin Lee
2016-04-07 14:55:06 +01:00
parent 2de9313d2c
commit 330c2052ec
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/CredentialStorage.java
View File

@@ -208,9 +208,9 @@ public final class CredentialStorage extends Activity {
* Returns true if the currently set key guard matches our minimum quality requirements. * Returns true if the currently set key guard matches our minimum quality requirements.
*/ */
private boolean checkKeyGuardQuality() { private boolean checkKeyGuardQuality() {
UserInfo parent = UserManager.get(this).getProfileParent(UserHandle.myUserId()); int credentialOwner =
int quality = new LockPatternUtils(this).getActivePasswordQuality( UserManager.get(this).getCredentialOwnerProfile(UserHandle.myUserId());
parent != null ? parent.id : UserHandle.myUserId()); int quality = new LockPatternUtils(this).getActivePasswordQuality(credentialOwner);
return (quality >= MIN_PASSWORD_QUALITY); return (quality >= MIN_PASSWORD_QUALITY);
} }