Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I15972e8666a0362b600c6d22deb3dd20d8949562
This commit is contained in:
Joe Bolinger
2021-06-29 20:14:45 +00:00
committed by Automerger Merge Worker
parent f538cb084e 83cf7cb3ec
commit 353fefafe8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/biometrics/AuthSession.java
View File

@@ -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;