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

Commit 23d6df2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix parameter for Gatekeeper re-enroll in SyntheticPasswordManager"... 

Merge "Fix parameter for Gatekeeper re-enroll in SyntheticPasswordManager" into main am: 277e5df4 am: 5aec5b67

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3228784



Change-Id: If2f2feca5acf628cfb127a059c9daf45491eb687
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e293bd2 5aec5b67

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

+1 −1
Original line number Diff line number Diff line
@@ -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);