From a0ab1d435ffab9ff926c11b14aafe24353868b2b Mon Sep 17 00:00:00 2001 From: Ellen Arteca Date: Tue, 30 Apr 2024 22:32:34 +0000 Subject: Revert "Wipe the LockscreenCredential in DPMS#resetPasswordInternal" This reverts commit eec02e9f1025c853e8b605508818e3f36d5a339b. Reason for revert: Investigating b/338122208, this CL causes an error. Change-Id: I7bb87951011d6bda957efc776bb67bb938d8cdb5 --- .../server/devicepolicy/DevicePolicyManagerService.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 293f379199a6..dd49260e160e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5672,18 +5672,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token, int flags, CallerIdentity caller) { - final boolean isPin = PasswordMetrics.isNumericOnly(password); - try (LockscreenCredential newCredential = - isPin ? LockscreenCredential.createPin(password) : - LockscreenCredential.createPasswordOrNone(password)) { - return resetPasswordInternal(newCredential, tokenHandle, token, flags, caller); - } - } - - private boolean resetPasswordInternal(LockscreenCredential newCredential, - long tokenHandle, byte[] token, int flags, CallerIdentity caller) { final int callingUid = caller.getUid(); final int userHandle = UserHandle.getUserId(callingUid); + final boolean isPin = PasswordMetrics.isNumericOnly(password); + final LockscreenCredential newCredential; + if (isPin) { + newCredential = LockscreenCredential.createPin(password); + } else { + newCredential = LockscreenCredential.createPasswordOrNone(password); + } synchronized (getLockObject()) { final PasswordMetrics minMetrics = getPasswordMinimumMetricsUnchecked(userHandle); final int complexity = getAggregatedPasswordComplexityLocked(userHandle); -- cgit v1.2.3-59-g8ed1b