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

Commit 3104109f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Metrics logging for DPM.isActivePasswordSufficientForDeviceRequirement"

parents 52ec3896 e8705e62

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -4277,7 +4277,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        final int parentUser = getProfileParentId(profileUserId);

        final int parentUser = getProfileParentId(profileUserId);

        enforceUserUnlocked(parentUser);

        enforceUserUnlocked(parentUser);




















        final boolean isSufficient;











        synchronized (getLockObject()) {







        synchronized (getLockObject()) {
























            int complexity = getAggregatedPasswordComplexityLocked(parentUser, true);







            int complexity = getAggregatedPasswordComplexityLocked(parentUser, true);











            PasswordMetrics minMetrics = getPasswordMinimumMetricsUnchecked(parentUser, true);







            PasswordMetrics minMetrics = getPasswordMinimumMetricsUnchecked(parentUser, true);

























@@ -4285,8 +4287,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {









            final List<PasswordValidationError> passwordValidationErrors =







            final List<PasswordValidationError> passwordValidationErrors =











                    PasswordMetrics.validatePasswordMetrics(







                    PasswordMetrics.validatePasswordMetrics(











                            minMetrics, complexity, false, metrics);







                            minMetrics, complexity, false, metrics);











            return passwordValidationErrors.isEmpty();







            isSufficient = passwordValidationErrors.isEmpty();











        }







        }














        DevicePolicyEventLogger














                .createEvent(DevicePolicyEnums.IS_ACTIVE_PASSWORD_SUFFICIENT_FOR_DEVICE)














                .setStrings(mOwners.getProfileOwnerComponent(caller.getUserId()).getPackageName())














                .write();














        return isSufficient;











    }







    }



























    @Override







    @Override