Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e996f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Id31eb872e1587235a99ce7bc806c99d87b98b63f
parents 9cb35514 4eaca4eb

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

+7 −1
Original line number Diff line number Diff line
@@ -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);

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

+7 −1
Original line number Diff line number Diff line
@@ -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);