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

Merge "Always clear password reset token when removing device owner" into udc-dev

Browse Source
This commit is contained in:
Rubin Xu
2023-05-02 17:25:18 +00:00
committed by Android (Google) Code Review
parent 03238a8af4 98ddbe5085
commit 65108620c4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10011,10 +10011,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
"clearDeviceOwner can only be called by the device owner"); "clearDeviceOwner can only be called by the device owner");
} }
enforceUserUnlocked(deviceOwnerUserId); enforceUserUnlocked(deviceOwnerUserId);
DevicePolicyData policy = getUserData(deviceOwnerUserId);
if (policy.mPasswordTokenHandle != 0) {
mLockPatternUtils.removeEscrowToken(policy.mPasswordTokenHandle, deviceOwnerUserId);
}
final ActiveAdmin admin = getDeviceOwnerAdminLocked(); final ActiveAdmin admin = getDeviceOwnerAdminLocked();
mInjector.binderWithCleanCallingIdentity(() -> { mInjector.binderWithCleanCallingIdentity(() -> {
@@ -10069,6 +10065,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
final DevicePolicyData policyData = getUserData(userId); final DevicePolicyData policyData = getUserData(userId);
policyData.mCurrentInputMethodSet = false; policyData.mCurrentInputMethodSet = false;
if (policyData.mPasswordTokenHandle != 0) {
mLockPatternUtils.removeEscrowToken(policyData.mPasswordTokenHandle, userId);
policyData.mPasswordTokenHandle = 0;
}
saveSettingsLocked(userId); saveSettingsLocked(userId);
mPolicyCache.onUserRemoved(userId); mPolicyCache.onUserRemoved(userId);
final DevicePolicyData systemPolicyData = getUserData(UserHandle.USER_SYSTEM); final DevicePolicyData systemPolicyData = getUserData(UserHandle.USER_SYSTEM);