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

Merge "Prevent GenerateChallenge being dropped in some corner cases"

Browse Source
This commit is contained in:
Kevin Chyn
2020-10-02 00:04:12 +00:00
committed by Android (Google) Code Review
parent db696aed18 f54a1370e2
commit 9afc8f902b
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/biometrics/sensors/face/Face10.java
View File

@@ -519,19 +519,17 @@ class Face10 implements IHwBinder.DeathRecipient {
@NonNull String opPackageName) {
mHandler.post(() -> {
if (mCurrentChallengeOwner != null) {
Slog.w(TAG, "Current challenge owner: " + mCurrentChallengeOwner
+ ", interrupted by: " + opPackageName);
final ClientMonitorCallbackConverter listener =
mCurrentChallengeOwner.getListener();
if (listener == null) {
Slog.w(TAG, "Null listener, skip sending interruption callback");
return;
}
try {
listener.onChallengeInterrupted(mSensorId);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to notify challenge interrupted", e);
Slog.w(TAG, "Current challenge owner: " + mCurrentChallengeOwner
+ ", listener: " + listener
+ ", interrupted by: " + opPackageName);
if (listener != null) {
try {
listener.onChallengeInterrupted(mSensorId);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to notify challenge interrupted", e);
}
}
}