Merge "Allow fingerprint fallback from any state." into sc-dev

This commit is contained in:
Joe Bolinger
2021-06-29 19:54:44 +00:00
committed by Android (Google) Code Review

View File

@@ -542,9 +542,9 @@ public final class AuthSession implements IBinder.DeathRecipient {
if (mState != STATE_AUTH_STARTED if (mState != STATE_AUTH_STARTED
&& mState != STATE_AUTH_STARTED_UI_SHOWING && mState != STATE_AUTH_STARTED_UI_SHOWING
&& mState != STATE_AUTH_PAUSED) { && mState != STATE_AUTH_PAUSED
Slog.e(TAG, "onStartFingerprint, unexpected state: " + mState); && mState != STATE_ERROR_PENDING_SYSUI) {
return; Slog.w(TAG, "onStartFingerprint, started from unexpected state: " + mState);
} }
mMultiSensorState = MULTI_SENSOR_STATE_FP_SCANNING; mMultiSensorState = MULTI_SENSOR_STATE_FP_SCANNING;