diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-07-02 15:38:35 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-07-08 19:23:09 +0000 |
| commit | ba45bcb36437aefa5fe2a3e72388a01debb90813 (patch) | |
| tree | d4da3177db7ab675fc559012382f15e0eb8d6b00 /core/java | |
| parent | 6792a233eb70c660370093b591d1e94f68b0fc8a (diff) | |
| download | frameworks_base-ba45bcb36437aefa5fe2a3e72388a01debb90813.zip frameworks_base-ba45bcb36437aefa5fe2a3e72388a01debb90813.tar.gz frameworks_base-ba45bcb36437aefa5fe2a3e72388a01debb90813.tar.bz2 | |
Fix DeviceManagerAdmin with empty password
Checked for null, but need to check for "" as well
Bug: 15832986
Change-Id: I3dc5d61717180180229f2395eef1dbe54d812d54
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 5bd6f52..916586c 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -689,7 +689,7 @@ public class LockPatternUtils { try { getLockSettings().setLockPassword(password, userHandle); DevicePolicyManager dpm = getDevicePolicyManager(); - if (password != null) { + if (!TextUtils.isEmpty(password)) { int computedQuality = computePasswordQuality(password); if (userHandle == UserHandle.USER_OWNER) { @@ -764,9 +764,10 @@ public class LockPatternUtils { } setString(PASSWORD_HISTORY_KEY, passwordHistory, userHandle); } else { + // Empty password if (userHandle == UserHandle.USER_OWNER) { - // Update the encryption password. - updateEncryptionPassword(StorageManager.CRYPT_TYPE_DEFAULT, password); + // Set the encryption password to default. + updateEncryptionPassword(StorageManager.CRYPT_TYPE_DEFAULT, null); } dpm.setActivePasswordState( |