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

Commit d37dae51 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Remove sensorId, userId from onChallenge*"

parents f51af3b7 0d13e044

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/ISessionCallback.aidl

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package android.hardware.biometrics.face; 
@VintfStability

interface ISessionCallback {

  void onStateChanged(in int cookie, in android.hardware.biometrics.face.SessionState state);

  void onChallengeGenerated(in int sensorId, in int userId, in long challenge);

  void onChallengeRevoked(in int sensorId, in int userId, in long challenge);

  void onChallengeGenerated(in long challenge);

  void onChallengeRevoked(in long challenge);

  void onAcquired(in android.hardware.biometrics.face.AcquiredInfo info, in int vendorCode);

  void onError(in android.hardware.biometrics.face.Error error, in int vendorCode);

  void onEnrollmentProgress(in int enrollmentId, int remaining);

biometrics/face/aidl/android/hardware/biometrics/face/ISessionCallback.aidl

+2 −2
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ interface ISessionCallback { 
    /**

     * Notifies the framework when a challenge is successfully generated.

     */

    void onChallengeGenerated(in int sensorId, in int userId, in long challenge);

    void onChallengeGenerated(in long challenge);



    /**

     * Notifies the framework when a challenge has been revoked.

     */

    void onChallengeRevoked(in int sensorId, in int userId, in long challenge);

    void onChallengeRevoked(in long challenge);



    /**

     * This method must only be used to notify the framework during the following states:

biometrics/face/aidl/vts/VtsHalBiometricsFaceTargetTest.cpp

+2 −4
Original line number Diff line number Diff line
@@ -51,13 +51,11 @@ class SessionCallback : public BnSessionCallback { 
        return ndk::ScopedAStatus::ok();

    }



    ndk::ScopedAStatus onChallengeGenerated(int32_t /*sensorId*/, int32_t /*userId*/,

                                            int64_t /*challenge*/) override {

    ndk::ScopedAStatus onChallengeGenerated(int64_t /*challenge*/) override {

        return ndk::ScopedAStatus::ok();

    }



    ndk::ScopedAStatus onChallengeRevoked(int32_t /*sensorId*/, int32_t /*userId*/,

                                          int64_t /*challenge*/) override {

    ndk::ScopedAStatus onChallengeRevoked(int64_t /*challenge*/) override {

        return ndk::ScopedAStatus::ok();

    }