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

Commit fc41b723 authored by Rubin Xu's avatar Rubin Xu
Browse files

Small fixes for reset password token 

1. Fail early when token handle is invalid
2. Dump out token handle in DPMS

Bug: 203411634
Test: dumpsys device_policy
Change-Id: I4d87b07113f746ea7e7457fada865f39a22a629e
parent 39bd9e7b

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);