diff options
| author | 2023-07-17 21:44:58 +0000 | |
|---|---|---|
| committer | 2023-07-17 21:44:58 +0000 | |
| commit | 1a17d962606434c8eb080930330e4f10dd86b28d (patch) | |
| tree | 4213cd5d7b307c2fc09bb59785a1f10d70642b5e | |
| parent | 485e9a03a5094d18314bec78ac9dd3ad5fe1d9bf (diff) | |
| parent | 573c008ae7a8648b5b58f1a4bed448719a8f8159 (diff) | |
Ensure the getCredentialType cache gets enabled am: 1ba0f6685d am: 573c008ae7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24102276
Change-Id: I2004dc1b3c598eec6b82d097aa42c79f41bc7964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 92cfa670045e..e60a5c36d761 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -1008,7 +1008,7 @@ public class LockPatternUtils { CREDENTIAL_TYPE_API, CREDENTIAL_TYPE_API, mCredentialTypeQuery); /** - * Invalidate the credential cache + * Invalidate the credential type cache * @hide */ public final static void invalidateCredentialTypeCache() { diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 2e62ef4f8566..48d46df37061 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -842,6 +842,10 @@ public class LockSettingsService extends ILockSettings.Stub { getAuthSecretHal(); mDeviceProvisionedObserver.onSystemReady(); + // Work around an issue in PropertyInvalidatedCache where the cache doesn't work until the + // first invalidation. This can be removed if PropertyInvalidatedCache is fixed. + LockPatternUtils.invalidateCredentialTypeCache(); + // TODO: maybe skip this for split system user mode. mStorage.prefetchUser(UserHandle.USER_SYSTEM); mBiometricDeferredQueue.systemReady(mInjector.getFingerprintManager(), |