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

Commit c4a1c7ab authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Allow fingerprint fallback from any state." into sc-dev am: 83cf7cb3 am: 353fefaf 

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

Change-Id: I4d6be05b3d95aaccca91b77c52685682e63bb206
parents 7ffb3ce3 353fefaf

services/core/java/com/android/server/biometrics/AuthSession.java

+3 −3
Original line number Diff line number Diff line
@@ -542,9 +542,9 @@ public final class AuthSession implements IBinder.DeathRecipient { 


        if (mState != STATE_AUTH_STARTED

                && mState != STATE_AUTH_STARTED_UI_SHOWING

                && mState != STATE_AUTH_PAUSED) {

            Slog.e(TAG, "onStartFingerprint, unexpected state: " + mState);

            return;

                && mState != STATE_AUTH_PAUSED

                && mState != STATE_ERROR_PENDING_SYSUI) {

            Slog.w(TAG, "onStartFingerprint, started from unexpected state: " + mState);

        }



        mMultiSensorState = MULTI_SENSOR_STATE_FP_SCANNING;