Ensure the getCredentialType cache gets enabled am: 1ba0f6685d

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

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

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() {

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(),