diff options
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 20 |
1 files changed, 10 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 177b7b46bb24..ff5cc230627e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3377,7 +3377,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordQualityCacheForUserGroup(userId); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); }); } DevicePolicyEventLogger @@ -3591,7 +3591,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_LENGTH) @@ -3869,7 +3869,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_UPPER_CASE) @@ -3899,7 +3899,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_LOWER_CASE) @@ -3931,7 +3931,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_LETTERS) @@ -3963,7 +3963,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_NUMERIC) @@ -3995,7 +3995,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_SYMBOLS) @@ -4028,7 +4028,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { updatePasswordValidityCheckpointLocked(userId, parent); saveSettingsLocked(userId); } - maybeLogPasswordComplexitySet(who, userId, parent, passwordPolicy); + logPasswordQualitySetIfSecurityLogEnabled(who, userId, parent, passwordPolicy); } DevicePolicyEventLogger .createEvent(DevicePolicyEnums.SET_PASSWORD_MINIMUM_NON_LETTER) @@ -14159,8 +14159,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { parametersFile.delete(); } - private void maybeLogPasswordComplexitySet(ComponentName who, int userId, boolean parent, - PasswordPolicy passwordPolicy) { + private void logPasswordQualitySetIfSecurityLogEnabled(ComponentName who, int userId, + boolean parent, PasswordPolicy passwordPolicy) { if (SecurityLog.isLoggingEnabled()) { final int affectedUserId = parent ? getProfileParentId(userId) : userId; SecurityLog.writeEvent(SecurityLog.TAG_PASSWORD_COMPLEXITY_SET, who.getPackageName(), |