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

Commit 3f8bfc89 authored by Rubin Xu's avatar Rubin Xu
Browse files

Attempt to reconnect to weaver before verifying FRP credential 

In case weaver was not reachable during boot, try to initialize
it again before using it to verify FRP credential.

Bug: 144353449
Test: atest com.android.server.locksettings
Change-Id: I306c7a92d0783c1e4be8faeaab7288d83f747406
parent d02b1333

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

+4 −0
Original line number Diff line number Diff line
@@ -721,6 +721,10 @@ public class SyntheticPasswordManager { 
            }

            return VerifyCredentialResponse.fromGateKeeperResponse(response);

        } else if (persistentData.type == PersistentData.TYPE_SP_WEAVER) {

            if (!isWeaverAvailable()) {

                Slog.e(TAG, "No weaver service to verify SP-based FRP credential");

                return VerifyCredentialResponse.ERROR;

            }

            PasswordData pwd = PasswordData.fromBytes(persistentData.payload);

            byte[] pwdToken = computePasswordToken(userCredential, pwd);

            int weaverSlot = persistentData.userId;