Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0ab1d43 authored by Ellen Arteca's avatar Ellen Arteca Committed by Gerrit Code Review
Browse files

Revert "Wipe the LockscreenCredential in DPMS#resetPasswordInternal" 

This reverts commit eec02e9f.

Reason for revert: Investigating b/338122208, this CL causes an error.

Change-Id: I7bb87951011d6bda957efc776bb67bb938d8cdb5
parent eec02e9f

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −10
Original line number Diff line number Diff line
@@ -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);