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

Commit 0339eed3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev... 

Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev am: b3929f1e am: 05c29c86

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

Change-Id: Ibb4d31b3d573a181f1486357c329887926715f13
parents 6ff6b894 05c29c86

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

+5 −8
Original line number Diff line number Diff line
@@ -287,11 +287,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final Executor mBackgroundExecutor;



    /**

     * Short delay before restarting biometric authentication after a successful try

     * This should be slightly longer than the time between on<biometric>Authenticated

     * (e.g. onFingerprintAuthenticated) and setKeyguardGoingAway(true).

     * Short delay before restarting fingerprint authentication after a successful try. This should

     * be slightly longer than the time between onFingerprintAuthenticated and

     * setKeyguardGoingAway(true).

     */

    private static final int BIOMETRIC_CONTINUE_DELAY_MS = 500;

    private static final int FINGERPRINT_CONTINUE_DELAY_MS = 500;



    // If the HAL dies or is unable to authenticate, keyguard should retry after a short delay

    private int mHardwareFingerprintUnavailableRetryCount = 0;
@@ -599,7 +599,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        }



        mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE),

                BIOMETRIC_CONTINUE_DELAY_MS);

                FINGERPRINT_CONTINUE_DELAY_MS);



        // Only authenticate fingerprint once when assistant is visible

        mAssistantVisible = false;
@@ -782,9 +782,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            }

        }



        mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE),

                BIOMETRIC_CONTINUE_DELAY_MS);



        // Only authenticate face once when assistant is visible

        mAssistantVisible = false;