Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add DPMS reset password metrics" into sc-dev am: 68d3b19012

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640415

Change-Id: I4650ad90ef84f9d8f4cfbbc0a747a185c8e2c6a9
This commit is contained in:
Alex Johnston
2021-05-24 10:01:51 +00:00
committed by Automerger Merge Worker
parent 91f2ddb478 68d3b19012
commit 4481c151a6
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4951,10 +4951,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final CallerIdentity caller = getCallerIdentity(); final CallerIdentity caller = getCallerIdentity();
final int userHandle = caller.getUserId(); final int userHandle = caller.getUserId();
// As of R, only privlleged caller holding RESET_PASSWORD can call resetPassword() to // As of R, only privileged caller holding RESET_PASSWORD can call resetPassword() to
// set password to an unsecured user. // set password to an unsecured user.
if (hasCallingPermission(permission.RESET_PASSWORD)) { if (hasCallingPermission(permission.RESET_PASSWORD)) {
return setPasswordPrivileged(password, flags, caller); final boolean result = setPasswordPrivileged(password, flags, caller);
if (result) {
DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.RESET_PASSWORD)
.write();
}
return result;
} }
// If caller has PO (or DO) throw or fail silently depending on its target SDK level. // If caller has PO (or DO) throw or fail silently depending on its target SDK level.
@@ -15243,8 +15249,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
DevicePolicyData policy = getUserData(caller.getUserId()); DevicePolicyData policy = getUserData(caller.getUserId());
if (policy.mPasswordTokenHandle != 0) { if (policy.mPasswordTokenHandle != 0) {
final String password = passwordOrNull != null ? passwordOrNull : ""; final String password = passwordOrNull != null ? passwordOrNull : "";
return resetPasswordInternal(password, policy.mPasswordTokenHandle, token, final boolean result = resetPasswordInternal(password, policy.mPasswordTokenHandle,
flags, caller); token, flags, caller);
if (result) {
DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.RESET_PASSWORD_WITH_TOKEN)
.setAdmin(caller.getComponentName())
.write();
}
return result;
} else { } else {
Slogf.w(LOG_TAG, "No saved token handle"); Slogf.w(LOG_TAG, "No saved token handle");
} }