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

Merge "Fix NPE in *GenerateChallengeClient" into sc-dev am: 4eaca4eb94

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

Change-Id: Ibc37f1554330bec3dba42fb04bf194dae76b3571
This commit is contained in:
TreeHugger Robot
2021-06-28 21:12:37 +00:00
committed by Automerger Merge Worker
parent 95d5266d81 4eaca4eb94
commit a3913a2c33
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java
View File

@@ -52,7 +52,13 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio
void onChallengeGenerated(int sensorId, int userId, long challenge) {
try {
getListener().onChallengeGenerated(sensorId, userId, challenge);
final ClientMonitorCallbackConverter listener = getListener();
if (listener == null) {
Slog.e(TAG, "Listener is null in onChallengeGenerated");
mCallback.onClientFinished(this, false /* success */);
return;
}
listener.onChallengeGenerated(sensorId, userId, challenge);
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to send challenge", e);

8
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java
View File

@@ -53,7 +53,13 @@ class FingerprintGenerateChallengeClient extends GenerateChallengeClient<ISessio
void onChallengeGenerated(int sensorId, int userId, long challenge) {
try {
getListener().onChallengeGenerated(sensorId, userId, challenge);
final ClientMonitorCallbackConverter listener = getListener();
if (listener == null) {
Slog.e(TAG, "Listener is null in onChallengeGenerated");
mCallback.onClientFinished(this, false /* success */);
return;
}
listener.onChallengeGenerated(sensorId, userId, challenge);
mCallback.onClientFinished(this, true /* success */);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to send challenge", e);