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

Commit 929c8cdc authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Don't cache mIsUdfpsEnrolled 

AuthController.isUdfpsEnrolled no longer makes
any IPC calls, so we don't need to cache the value
in KeyguardUpdateMonitor which can cause the state
to be stale.

Test: manually check dumpsys on reboot, udfps enrollment state
is correct
Test: atest SystemUITests
Fixes: 218718078
Change-Id: I4f81465743cdea9e8f01b6bfd5637d0ee450c29a
parent c133afd4

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −8
Original line number Diff line number Diff line
@@ -325,8 +325,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final InteractionJankMonitor mInteractionJankMonitor;

    private final LatencyTracker mLatencyTracker;

    private boolean mLogoutEnabled;

    // cached value to avoid IPCs

    private boolean mIsUdfpsEnrolled;

    private boolean mIsFaceEnrolled;

    // If the user long pressed the lock icon, disabling face auth for the current session.

    private boolean mLockIconPressed;
@@ -2117,10 +2115,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                false, mTimeFormatChangeObserver, UserHandle.USER_ALL);

    }



    private void updateUdfpsEnrolled(int userId) {

        mIsUdfpsEnrolled = mAuthController.isUdfpsEnrolled(userId);

    }



    private void updateFaceEnrolled(int userId) {

        mIsFaceEnrolled = whitelistIpcs(

                () -> mFaceManager != null && mFaceManager.isHardwareDetected()
@@ -2132,7 +2126,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
     * @return true if there's at least one udfps enrolled for the current user.

     */

    public boolean isUdfpsEnrolled() {

        return mIsUdfpsEnrolled;

        return mAuthController.isUdfpsEnrolled(getCurrentUser());

    }



    /**
@@ -2186,7 +2180,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            return;

        }



        updateUdfpsEnrolled(getCurrentUser());

        final boolean shouldListenForFingerprint = shouldListenForFingerprint(isUdfpsSupported());

        final boolean runningOrRestarting = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING

                || mFingerprintRunningState == BIOMETRIC_STATE_CANCELLING_RESTARTING;

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+0 −2
Original line number Diff line number Diff line
@@ -433,7 +433,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
                public void onDozingChanged(boolean isDozing) {

                    mIsDozing = isDozing;

                    updateBurnInOffsets();

                    updateIsUdfpsEnrolled();

                    updateVisibility();

                }
@@ -513,7 +512,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
                    mKeyguardUpdateMonitor.getUserUnlockedWithBiometric(

                        KeyguardUpdateMonitor.getCurrentUser());

            }

            updateIsUdfpsEnrolled();

            updateVisibility();

        }