summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin DeMartino <jjdemartino@google.com>2019-03-07 10:11:03 -0800
committerdianlujitao <dianlujitao@lineageos.org>2019-11-01 04:13:41 +0100
commitb978e8849dc65d0fec7b7b05e667ea1d7c546d29 (patch)
tree5e7204b4c447cd1b554c86b36ac336190e22eebf
parentd725454570d05ab2491ebbf25de4539259ef2d53 (diff)
downloadandroid_frameworks_base-b978e8849dc65d0fec7b7b05e667ea1d7c546d29.tar.gz
android_frameworks_base-b978e8849dc65d0fec7b7b05e667ea1d7c546d29.tar.bz2
android_frameworks_base-b978e8849dc65d0fec7b7b05e667ea1d7c546d29.zip
Fix Build Credentials refactored to use byte[]
Bug: 127810705 Change-Id: I766b553aef0479c286c0eee7302bb5e3b04b85bf
-rw-r--r--services/core/java/com/android/server/locksettings/LockSettingsService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 0d98994ec82..c9fd9a3b267 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -1794,7 +1794,9 @@ public class LockSettingsService extends ILockSettings.Stub {
false, 0, userId, progressCallback);
if ((response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) &&
(userId == UserHandle.USER_OWNER)) {
- retainPassword(credential);
+ //TODO(b/127810705): Update to credentials to use byte[]
+ String credentialString = credential == null ? null : new String(credential);
+ retainPassword(credentialString);
}
return response;
}