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

Merge "Add null check before invoking onChallengeInterruptFinished"

Browse Source
This commit is contained in:
Kevin Chyn
2020-11-02 19:17:55 +00:00
committed by Android (Google) Code Review
parent a6b2647cf3 7105f65818
commit 5cb7da240d
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -582,13 +582,19 @@ class Face10 implements IHwBinder.DeathRecipient {
final FaceGenerateChallengeClient previousChallengeOwner =
mCurrentChallengeOwner.getInterruptedClient();
mCurrentChallengeOwner = null;
Slog.d(TAG, "Previous challenge owner: " + previousChallengeOwner);
if (previousChallengeOwner != null) {
try {
previousChallengeOwner.getListener()
.onChallengeInterruptFinished(mSensorId);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to notify interrupt finished", e);
final ClientMonitorCallbackConverter listener =
previousChallengeOwner.getListener();
if (listener == null) {
Slog.w(TAG, "Listener is null");
} else {
try {
listener.onChallengeInterruptFinished(mSensorId);
} catch (RemoteException e) {
Slog.e(TAG, "Unable to notify interrupt finished", e);
}
}
}
}