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

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

Merge "Remove timeout from face generateChallenge" into sc-dev am: 01e0568c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99a73880d347aa09e743b4c45908d069530ce9e5
parents df6d4b56 01e0568c

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

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.server.biometrics.sensors.GenerateChallengeClient; 
 */

public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISession> {

    private static final String TAG = "FaceGenerateChallengeClient";

    private static final int CHALLENGE_TIMEOUT_SEC = 600; // 10 minutes



    FaceGenerateChallengeClient(@NonNull Context context,

            @NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token,
@@ -43,7 +42,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio 
    @Override

    protected void startHalOperation() {

        try {

            getFreshDaemon().generateChallenge(mSequentialId, CHALLENGE_TIMEOUT_SEC);

            getFreshDaemon().generateChallenge(mSequentialId);

        } catch (RemoteException e) {

            Slog.e(TAG, "Unable to generateChallenge", e);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class TestHal extends IFace.Stub { 


        return new ISession.Stub() {

            @Override

            public void generateChallenge(int cookie, int timeoutSec) throws RemoteException {

            public void generateChallenge(int cookie) throws RemoteException {

                Slog.w(TAG, "generateChallenge, cookie: " + cookie);

                cb.onChallengeGenerated(0L);

            }