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

Commit e6137df5 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-edb9e31c38704f8a922e0a1b4ba0055e" into tm-mainline-prod 

* changes:
  [automerge] Small fixes for reset password token 2p: fc41b723
  Small fixes for reset password token
parents d47463a0 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);