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

Commit 4bb27d86 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add missing calls to key sync task in LockSettingsService"

parents 2010a7ed f899bff7

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

+5 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,8 @@ public class LockSettingsService extends ILockSettings.Stub { 
                userId, progressCallback);

        // The user employs synthetic password based credential.

        if (response != null) {

            mRecoverableKeyStoreManager.lockScreenSecretAvailable(credentialType, credential,

                    userId);

            return response;

        }
@@ -1705,6 +1707,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
                                /* TODO(roosa): keep the same password quality */, userId);

                if (!hasChallenge) {

                    notifyActivePasswordMetricsAvailable(credential, userId);

                    // Use credentials to create recoverable keystore snapshot.

                    mRecoverableKeyStoreManager.lockScreenSecretAvailable(

                            storedHash.type, credential, userId);

                    return VerifyCredentialResponse.OK;

                }

                // Fall through to get the auth token. Technically this should never happen,