diff options
| author | 2023-10-17 00:20:26 +0000 | |
|---|---|---|
| committer | 2023-10-17 00:20:26 +0000 | |
| commit | 8ce12251685db2e01c9c76a6fb745c2022357722 (patch) | |
| tree | f8f6c03d55bdcd1dd87cbdeab7356fc95363cc0f | |
| parent | 037f0026d9c4845e4f4a51ba20f1d3d15aab9858 (diff) | |
| parent | ec6110bfd8f4de78a4bb16bb8005f8aeef0b0bad (diff) | |
Merge changes from topic "locksettings-aosp-5" into main am: ec6110bfd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2791428
Change-Id: I2a7dbd2cb6dfa89bc535e90e74a52365fd97766a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
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 0cfdaf26cc1c..10b6052bec69 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 @@ public class RecoverableKeyStoreManager { 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) { |