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

Commit af9495df authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp-5" into main am: ec6110bf 

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



Change-Id: I257a1abf201bc1e90c487dc75c4ebba5f7c7e650
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c65e55e ec6110bf

services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -195,8 +195,12 @@ public class RecoverableKeyStoreManager { 
        mApplicationKeyStorage = applicationKeyStorage;

        mApplicationKeyStorage = applicationKeyStorage;

        mTestCertHelper = testOnlyInsecureCertificateHelper;

        mTestCertHelper = testOnlyInsecureCertificateHelper;

        mCleanupManager = cleanupManager;

        mCleanupManager = cleanupManager;

        try {

            // Clears data for removed users.

            // Clears data for removed users.

            mCleanupManager.verifyKnownUsers();

            mCleanupManager.verifyKnownUsers();

        } catch (Exception e) {

            Log.e(TAG, "Failed to verify known users", e);

        }

        try {

        try {

            mRecoverableKeyGenerator = RecoverableKeyGenerator.newInstance(mDatabase);

            mRecoverableKeyGenerator = RecoverableKeyGenerator.newInstance(mDatabase);

        } catch (NoSuchAlgorithmException e) {

        } catch (NoSuchAlgorithmException e) {