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

Commit e7b45d5b authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Ensure the getCredentialType cache gets enabled" into main

parents a2e5ff93 d91457a1

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1015,7 +1015,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

+4 −0
Original line number Diff line number Diff line
@@ -847,6 +847,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(),