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

Commit 252ef2f9 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I9d3c3b2e3e6a39425bcc9f8fc091f9cd1f9600cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1789ce4 65108620

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

+4 −4
Original line number Diff line number Diff line
@@ -10011,10 +10011,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                        "clearDeviceOwner can only be called by the device owner");

            }

            enforceUserUnlocked(deviceOwnerUserId);

            DevicePolicyData policy = getUserData(deviceOwnerUserId);

            if (policy.mPasswordTokenHandle != 0) {

                mLockPatternUtils.removeEscrowToken(policy.mPasswordTokenHandle, deviceOwnerUserId);

            }















            final ActiveAdmin admin = getDeviceOwnerAdminLocked();















            mInjector.binderWithCleanCallingIdentity(() -> {










@@ -10069,6 +10065,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        }















        final DevicePolicyData policyData = getUserData(userId);















        policyData.mCurrentInputMethodSet = false;













        if (policyData.mPasswordTokenHandle != 0) {













            mLockPatternUtils.removeEscrowToken(policyData.mPasswordTokenHandle, userId);













            policyData.mPasswordTokenHandle = 0;













        }















        saveSettingsLocked(userId);















        mPolicyCache.onUserRemoved(userId);















        final DevicePolicyData systemPolicyData = getUserData(UserHandle.USER_SYSTEM);