diff options
| author | 2021-06-29 19:54:44 +0000 | |
|---|---|---|
| committer | 2021-06-29 19:54:44 +0000 | |
| commit | 83cf7cb3ecea8c51572fd9ccf7feb4e6f7814a9f (patch) | |
| tree | 1f02258c1ce1e8f9e936b2ca22e4cb84c5a631bf | |
| parent | 0ac141c3ba3bbb5772a0c282bb75d71b60296eaf (diff) | |
| parent | 103ee4b62b454ee5355da7debd243d4d0d1fc40c (diff) | |
Merge "Allow fingerprint fallback from any state." into sc-dev
| -rw-r--r-- | services/core/java/com/android/server/biometrics/AuthSession.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java index 8f364890aa06..f1f5251e59bb 100644 --- a/services/core/java/com/android/server/biometrics/AuthSession.java +++ b/services/core/java/com/android/server/biometrics/AuthSession.java @@ -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; |