From df406d802e9f6348f307ebbe1809c5cdc6c0b64e Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Thu, 16 Feb 2017 16:49:43 +0000 Subject: Normalize empty credential into null Test: runtest frameworks-services -c com.android.server.LockSettingsServiceTests Bug: 31000522 Change-Id: I2f804a5790449f0d2d4d57fe6e34be03a84fb805 --- services/core/java/com/android/server/LockSettingsService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index 4a4453046295..f76ddc71bc01 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -1064,6 +1064,14 @@ public class LockSettingsService extends ILockSettings.Stub { private void setLockCredentialInternal(String credential, int credentialType, String savedCredential, int userId) throws RemoteException { + // Normalize savedCredential and credential such that empty string is always represented + // as null. + if (TextUtils.isEmpty(savedCredential)) { + savedCredential = null; + } + if (TextUtils.isEmpty(credential)) { + credential = null; + } synchronized (mSpManager) { if (isSyntheticPasswordBasedCredentialLocked(userId)) { spBasedSetLockCredentialInternalLocked(credential, credentialType, savedCredential, -- cgit v1.2.3-59-g8ed1b