commit 277e5df4c699aaa9ee2ed505ea83a41cb2068e01
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 12 19:36:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 12 19:36:06 2024 +0000
tree 63547f1b9e9c9ab37d74c4a0770028c3ba2ddedb
parent d237ccca094545548486d2d4b1581e247e770e1a
parent 89db614840e6707aedc953d07f1f4a87d3c66bbd

Merge "Fix parameter for Gatekeeper re-enroll in SyntheticPasswordManager" into main

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

diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
index cc58f38..3a429b0 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 @@
                     .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);