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

Commit 210c17bc authored by Rubin Xu's avatar Rubin Xu Committed by Presubmit Automerger Backend
Browse files

[automerge] Small fixes for reset password token 2p: fc41b723 2p: 9b79d8ce 

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

Bug: 203411634
Change-Id: Iecaf775276406cdc23fbad12fb940b7c4231c854
parents d37070ff 9b79d8ce

services/core/java/com/android/server/locksettings/LockSettingsService.java

+4 −0
Original line number Diff line number Diff line
@@ -3316,6 +3316,10 @@ public class LockSettingsService extends ILockSettings.Stub { 
            if (!mSpManager.hasEscrowData(userId)) {

                throw new SecurityException("Escrow token is disabled on the current user");

            }

            if (!isEscrowTokenActive(tokenHandle, userId)) {

                Slog.e(TAG, "Unknown or unactivated token: " + Long.toHexString(tokenHandle));

                return false;

            }

            result = setLockCredentialWithTokenInternalLocked(

                    credential, tokenHandle, token, userId);

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ class DevicePolicyData { 
        pw.println();

        pw.increaseIndent();

        pw.print("mPasswordOwner="); pw.println(mPasswordOwner);

        pw.print("mPasswordTokenHandle="); pw.println(Long.toHexString(mPasswordTokenHandle));

        pw.print("mUserControlDisabledPackages=");

        pw.println(mUserControlDisabledPackages);

        pw.print("mAppsSuspended="); pw.println(mAppsSuspended);