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

Merge "Credential storage: check lock quality for right user" into nyc-dev

Browse Source 
am: 16b4ac8

* commit '16b4ac8a8efb7ea06397ff559984c3c08f275398':
  Credential storage: check lock quality for right user

Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528
This commit is contained in:
Robin Lee
2016-04-08 10:58:34 +00:00
committed by android-build-merger
parent 717ed0eed7 16b4ac8a8e
commit c6696f1c86
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);
} }