From ba45bcb36437aefa5fe2a3e72388a01debb90813 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Wed, 2 Jul 2014 15:38:35 -0700 Subject: Fix DeviceManagerAdmin with empty password Checked for null, but need to check for "" as well Bug: 15832986 Change-Id: I3dc5d61717180180229f2395eef1dbe54d812d54 --- core/java/com/android/internal/widget/LockPatternUtils.java | 7 ++++--- 1 file 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( -- cgit v1.1