| commit | fc41b7231deac1e4a082408a70ea5e86ed3b1b51 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon Oct 18 16:12:18 2021 +0100 |
| committer | Rubin Xu <rubinxu@google.com> | Fri Mar 25 17:47:21 2022 +0000 |
| tree | 75deeace9fb023a7c333ad6f57e651bd6fc739ac | |
| parent | 39bd9e7b4604e87e8bc88754341d88967ae79e9e [diff] |
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
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 135af2d..30c41a5 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -3316,6 +3316,10 @@ 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); }
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java index e18e002..9a0b5c7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java
@@ -661,6 +661,7 @@ 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);