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

This commit is contained in:
Joe Bolinger
2022-01-26 23:47:01 +00:00
committed by Android (Google) Code Review
8 changed files with 26 additions and 0 deletions

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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

View File

@@ -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;

View File

@@ -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);
}

View File

@@ -473,4 +473,10 @@ interface ISession {
/** See ISession#onPointerUp(int) */
void onPointerUpWithContext(in PointerContext context);
/**
* This may be called while an authenticate, detect interaction, or enrollment operation is
* running when the context changes.
*/
void onContextChanged(in OperationContext context);
}

View File

@@ -270,4 +270,8 @@ ndk::ScopedAStatus Session::onPointerUpWithContext(const PointerContext& context
return onPointerUp(context.pointerId);
}
ndk::ScopedAStatus Session::onContextChanged(const common::OperationContext& /*context*/) {
return ndk::ScopedAStatus::ok();
}
} // namespace aidl::android::hardware::biometrics::fingerprint

View File

@@ -95,6 +95,8 @@ class Session : public BnSession {
ndk::ScopedAStatus onPointerUpWithContext(const PointerContext& context) override;
ndk::ScopedAStatus onContextChanged(const common::OperationContext& context) override;
bool isClosed();
private: