summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-09-12 19:58:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-12 19:58:22 +0000
commit23d6df2c1c9f19166f7cfdd3f7f29ff67fc0e3a0 (patch)
treebda598c78c1b8b2781a4843b8413cc3e31669adf
parent1e293bd213f50073402f7c627000551ed25957f7 (diff)
parent5aec5b674ead6ef9d1568026726e633688386204 (diff)
Merge "Fix parameter for Gatekeeper re-enroll in SyntheticPasswordManager" into main am: 277e5df4c6 am: 5aec5b674e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3228784 Change-Id: If2f2feca5acf628cfb127a059c9daf45491eb687 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
index cc58f38db65a..3a429b041b3c 100644
--- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
+++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
@@ -1701,7 +1701,7 @@ class SyntheticPasswordManager {
.setGatekeeperHAT(response.getPayload()).build();
if (response.getShouldReEnroll()) {
try {
- response = gatekeeper.enroll(userId, spHandle, spHandle,
+ response = gatekeeper.enroll(userId, spHandle, gatekeeperPassword,
gatekeeperPassword);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to invoke gatekeeper.enroll", e);