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

Commit c5f6938a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix onClientFinished for generate and revoke challenge" into sc-dev

parents c6de6e41 c091528f

services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ public abstract class RevokeChallengeClient<T> extends HalClientMonitor<T> { 
        super.start(callback);



        startHalOperation();

        mCallback.onClientFinished(this, true /* success */);

    }



    @Override

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

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio 
            getFreshDaemon().generateChallenge();

        } catch (RemoteException e) {

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

            mCallback.onClientFinished(this, false /* success */);

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class FaceRevokeChallengeClient extends RevokeChallengeClient<ISession> { 
            getFreshDaemon().revokeChallenge(mChallenge);

        } catch (RemoteException e) {

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

            mCallback.onClientFinished(this, false /* success */);

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<IBiomet 
            }

        } catch (RemoteException e) {

            Slog.e(TAG, "generateChallenge failed", e);

            mCallback.onClientFinished(this, false /* success */);

        }

    }

}

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceRevokeChallengeClient.java

+2 −0
Original line number Diff line number Diff line
@@ -43,8 +43,10 @@ public class FaceRevokeChallengeClient extends RevokeChallengeClient<IBiometrics 
    protected void startHalOperation() {

        try {

            getFreshDaemon().revokeChallenge();

            mCallback.onClientFinished(this, true /* success */);

        } catch (RemoteException e) {

            Slog.e(TAG, "revokeChallenge failed", e);

            mCallback.onClientFinished(this, false /* success */);

        }

    }

}