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

Commit 6bc96ab4 authored by Joe Bolinger's avatar Joe Bolinger Committed by Android (Google) Code Review
Browse files

Merge "Add update context method to face and fingerprint HAL."

parents 711d3c88 25e9823f

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

+1 −0
Original line number Diff line number Diff line
@@ -51,4 +51,5 @@ interface ISession { 
  android.hardware.biometrics.common.ICancellationSignal authenticateWithContext(in long operationId, in android.hardware.biometrics.common.OperationContext context);

  android.hardware.biometrics.common.ICancellationSignal enrollWithContext(in android.hardware.keymaster.HardwareAuthToken hat, in android.hardware.biometrics.face.EnrollmentType type, in android.hardware.biometrics.face.Feature[] features, in @nullable android.hardware.common.NativeHandle previewSurface, in android.hardware.biometrics.common.OperationContext context);

  android.hardware.biometrics.common.ICancellationSignal detectInteractionWithContext(in android.hardware.biometrics.common.OperationContext context);

  void onContextChanged(in android.hardware.biometrics.common.OperationContext context);

}

biometrics/face/aidl/android/hardware/biometrics/face/ISession.aidl

+6 −0
Original line number Diff line number Diff line
@@ -461,4 +461,10 @@ interface ISession { 


    /* See ISession#detectInteraction() */

    ICancellationSignal detectInteractionWithContext(in OperationContext context);



    /**

     * This may be called while an authenticate, detect interaction, or enrollment operation is

     * running when the context changes.

     */

    void onContextChanged(in OperationContext context);

}

biometrics/face/aidl/default/Session.cpp

+4 −0
Original line number Diff line number Diff line
@@ -172,4 +172,8 @@ ndk::ScopedAStatus Session::detectInteractionWithContext( 
    return detectInteraction(out);

}



ndk::ScopedAStatus Session::onContextChanged(const common::OperationContext& /*context*/) {

    return ndk::ScopedAStatus::ok();

}



}  // namespace aidl::android::hardware::biometrics::face

biometrics/face/aidl/default/Session.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ class Session : public BnSession { 
            const common::OperationContext& context,

            std::shared_ptr<common::ICancellationSignal>* out) override;



    ndk::ScopedAStatus onContextChanged(const common::OperationContext& context) override;



  private:

    std::shared_ptr<ISessionCallback> cb_;

    std::mt19937 mRandom;

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISession.aidl

+1 −0
Original line number Diff line number Diff line
@@ -53,4 +53,5 @@ interface ISession { 
  android.hardware.biometrics.common.ICancellationSignal detectInteractionWithContext(in android.hardware.biometrics.common.OperationContext context);

  void onPointerDownWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);

  void onPointerUpWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);

  void onContextChanged(in android.hardware.biometrics.common.OperationContext context);

}