commit e30506c6f68b952f4bb82e0a807961a1bdfd2c7a
author Chun-Wei Wang <wangchun@google.com> Wed Sep 20 00:45:24 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 20 00:45:24 2023 +0000
tree 71b1e3fc9156e27cc420483f8a617153ee7517f8
parent 8f9a09b318ececa093b70f453246acc6b25c9f0d
parent 49db067d94d01c6de20b5ff795f8da23a9c312c8

Merge "Fix system process crash" into udc-qpr-dev am: 1d9b476c76 am: 49db067d94

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

Change-Id: Iacee29a8a96b8848c14ef1df0d3d88f5d72d4a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
index 0cfdaf2..10b6052 100644
--- a/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
+++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
@@ -195,8 +195,12 @@
         mApplicationKeyStorage = applicationKeyStorage;
         mTestCertHelper = testOnlyInsecureCertificateHelper;
         mCleanupManager = cleanupManager;
-        // Clears data for removed users.
-        mCleanupManager.verifyKnownUsers();
+        try {
+            // Clears data for removed users.
+            mCleanupManager.verifyKnownUsers();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to verify known users", e);
+        }
         try {
             mRecoverableKeyGenerator = RecoverableKeyGenerator.newInstance(mDatabase);
         } catch (NoSuchAlgorithmException e) {