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

am ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles

Browse Source 
* commit 'ea673970e16b49f28d7f39c8b4993f186e561d6d':
  Fix userId for credentials from managed profiles
This commit is contained in:
Jorim Jaggi
2015-06-29 21:23:26 +00:00
committed by Android Git Automerger
parent 7a63a8f08b ea673970e1
commit aa6a23a9b2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/CredentialStorage.java
View File

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