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

Fix enumerate corner case

Browse Source 
Do not post reset runnable when another client is requested while
cleanup is happening. The runnable will be "pending" and started once
cleanup finishes instead.

Fixes: 129534163

Test: Based on logs in the bug, this is reasonable
Test: reboot device, fingerprint still works
Change-Id: I766cc04be151abaae60a0092f71fd7a3acf3397a
Merged-In: I766cc04be151abaae60a0092f71fd7a3acf3397a
(cherry picked from commit ea80d17cb6)
This commit is contained in:
Kevin Chyn
2019-04-03 14:39:04 -07:00
parent dd07ae579c
commit df755c8b58
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/biometrics/BiometricServiceBase.java
View File

@@ -1045,10 +1045,15 @@ public abstract class BiometricServiceBase extends SystemService
}
} else {
currentClient.stop(initiatedByClient);
// Only post the reset runnable for non-cleanup clients. Cleanup clients should
// never be forcibly stopped since they ensure synchronization between HAL and
// framework. Thus, we should instead just start the pending client once cleanup
// finishes instead of using the reset runnable.
mHandler.removeCallbacks(mResetClientState);
mHandler.postDelayed(mResetClientState, CANCEL_TIMEOUT_LIMIT);
}
mPendingClient = newClient;
mHandler.removeCallbacks(mResetClientState);
mHandler.postDelayed(mResetClientState, CANCEL_TIMEOUT_LIMIT);
} else if (newClient != null) {
// For BiometricPrompt clients, do not start until
// <Biometric>Service#startPreparedClient is called. BiometricService waits until all
@@ -1225,6 +1230,7 @@ public abstract class BiometricServiceBase extends SystemService
} else {
clearEnumerateState();
if (mPendingClient != null) {
Slog.d(getTag(), "Enumerate finished, starting pending client");
startClient(mPendingClient, false /* initiatedByClient */);
}
}