Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove enroll_2_2 and authenticate_2_2

Browse Source 
Bug: 139317981
Bug: 149502271
Test: m vts -j
Test: vts-tradefed run commandAndExit vts -m VtsHalBiometricsFingerprintV2_2Target
Change-Id: I80492f324753291be4118de95e16ec370004afc8
This commit is contained in:
Ilya Matyukhin
2020-03-19 15:30:57 -07:00
parent 9a471eb8be
commit 49120d936c
2 changed files with 43 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
biometrics/fingerprint/2.2/IBiometricsFingerprint.hal
View File

@@ -17,42 +17,12 @@
package android.hardware.biometrics.fingerprint@2.2;
import @2.1::IBiometricsFingerprint;
import @2.1::RequestStatus;
/**
* The HAL interface for biometric fingerprint authentication.
*
* This interface is required because all top-level interfaces need to be
* updated in a minor uprev.
*/
interface IBiometricsFingerprint extends @2.1::IBiometricsFingerprint {
/**
* Fingerprint enroll request:
* Switches the HAL state machine to collect and store a new fingerprint
* template. Switches back as soon as enroll is complete, signalled by
* (fingerprintMsg.type == FINGERPRINT_TEMPLATE_ENROLLING &&
* fingerprintMsg.data.enroll.samplesRemaining == 0)
* or after timeoutSec seconds.
* The fingerprint template must be assigned to the group gid.
*
* @param hat a valid Hardware Authentication Token (HAT), generated
* as a result of a preEnroll() call.
* @param gid a framework defined fingerprint set (group) id.
* @param timeoutSec a timeout in seconds.
* @param windowId optional ID of an illumination window for optical under
* display fingerprint sensors. Must contain a null pointer if not used.
*
* @return debugErrno is a value the framework logs in case it is not 0.
*
* A notify() function may be called with a more detailed error structure.
*/
enroll_2_2(vec<uint8_t> hat, uint32_t gid, uint32_t timeoutSec, handle windowId)
generates (RequestStatus debugErrno);
/**
* Authenticates an operation identified by operationId
*
* @param operationId operation id.
* @param gid fingerprint group id.
* @param windowId optional ID of an illumination window for optical under
* display fingerprint sensors. Must contain a null pointer if not used.
*
* @return debugErrno is a value the framework logs in case it is not 0.
*/
authenticate_2_2(uint64_t operationId, uint32_t gid, handle windowId)
generates (RequestStatus debugErrno);
};

98
biometrics/fingerprint/2.2/vts/functional/VtsHalBiometricsFingerprintV2_2TargetTest.cpp
View File

@@ -18,65 +18,66 @@
#include <VtsHalHidlTargetCallbackBase.h>
#include <android-base/properties.h>
#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h>
#include <android/hardware/biometrics/fingerprint/2.2/IBiometricsFingerprint.h>
#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
#include <android/hardware/biometrics/fingerprint/2.2/IBiometricsFingerprintClientCallback.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/HidlSupport.h>
#include <hidl/ServiceManagement.h>
#include <cinttypes>
#include <random>
namespace {
namespace hidl_interface = android::hardware::biometrics::fingerprint::V2_1;
namespace hidl_interface_2_2 = android::hardware::biometrics::fingerprint::V2_2;
using hidl_interface::FingerprintError;
using hidl_interface::IBiometricsFingerprint;
using hidl_interface::RequestStatus;
using android::sp;
using android::base::GetUintProperty;
using android::hardware::hidl_handle;
using android::hardware::hidl_vec;
using android::hardware::Return;
using android::hardware::Void;
using android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo;
using android::hardware::biometrics::fingerprint::V2_1::FingerprintError;
using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;
using android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
using android::hardware::biometrics::fingerprint::V2_2::IBiometricsFingerprint;
namespace {
constexpr uint32_t kTimeoutSec = 3;
constexpr auto kTimeout = std::chrono::seconds(kTimeoutSec);
constexpr uint32_t kGroupId = 99;
constexpr char kCallbackNameOnError[] = "onError";
constexpr char kCallbackNameOnAcquired[] = "onAcquired";
// Callback arguments that need to be captured for the tests.
struct FingerprintCallbackArgs {
// The error passed to the last onError() callback.
FingerprintError error;
// The deviceId passed to the last callback.
uint64_t deviceId;
// The info passed to the last onAcquired() callback.
hidl_interface_2_2::FingerprintAcquiredInfo info;
};
// Test callback class for the BiometricsFingerprint HAL.
// The HAL will call these callback methods to notify about completed operations
// or encountered errors.
class FingerprintCallback : public ::testing::VtsHalHidlTargetCallbackBase<FingerprintCallbackArgs>,
public IBiometricsFingerprintClientCallback {
public hidl_interface_2_2::IBiometricsFingerprintClientCallback {
public:
Return<void> onEnrollResult(uint64_t, uint32_t, uint32_t, uint32_t) override { return Void(); }
Return<void> onAcquired(uint64_t, FingerprintAcquiredInfo, int32_t) override { return Void(); }
Return<void> onAcquired(uint64_t, hidl_interface::FingerprintAcquiredInfo, int32_t) override {
return Void();
}
Return<void> onAcquired_2_2(uint64_t, hidl_interface_2_2::FingerprintAcquiredInfo info,
int32_t) override {
FingerprintCallbackArgs args = {};
args.info = info;
NotifyFromCallback(kCallbackNameOnAcquired, args);
return Void();
}
Return<void> onAuthenticated(uint64_t, uint32_t, uint32_t, const hidl_vec<uint8_t>&) override {
return Void();
}
Return<void> onError(uint64_t deviceId, FingerprintError error, int32_t) override {
FingerprintCallbackArgs args = {};
args.error = error;
args.deviceId = deviceId;
NotifyFromCallback(kCallbackNameOnError, args);
return Void();
}
Return<void> onError(uint64_t, FingerprintError, int32_t) override { return Void(); }
Return<void> onRemoved(uint64_t, uint32_t, uint32_t, uint32_t) override { return Void(); }
@@ -121,41 +122,16 @@ class FingerprintHidlTest : public ::testing::TestWithParam<std::string> {
sp<FingerprintCallback> mCallback;
};
// Enroll with an invalid (all zeroes) HAT should fail.
TEST_P(FingerprintHidlTest, EnrollZeroHatTest) {
// Filling HAT with zeros
hidl_vec<uint8_t> token(69);
for (size_t i = 0; i < 69; i++) {
token[i] = 0;
}
hidl_handle windowId = nullptr;
Return<RequestStatus> ret = mService->enroll_2_2(token, kGroupId, kTimeoutSec, windowId);
ASSERT_EQ(RequestStatus::SYS_OK, static_cast<RequestStatus>(ret));
// At least one call to onError should occur
auto res = mCallback->WaitForCallback(kCallbackNameOnError);
ASSERT_NE(FingerprintError::ERROR_NO_ERROR, res.args->error);
}
// Enroll with an invalid (null) HAT should fail.
TEST_P(FingerprintHidlTest, EnrollGarbageHatTest) {
// Filling HAT with pseudorandom invalid data.
// Using default seed to make the test reproducible.
std::mt19937 gen(std::mt19937::default_seed);
std::uniform_int_distribution<uint8_t> dist;
hidl_vec<uint8_t> token(69);
for (size_t i = 0; i < 69; ++i) {
token[i] = dist(gen);
}
hidl_handle windowId = nullptr;
Return<RequestStatus> ret = mService->enroll_2_2(token, kGroupId, kTimeoutSec, windowId);
ASSERT_EQ(RequestStatus::SYS_OK, static_cast<RequestStatus>(ret));
// At least one call to onError should occur
auto res = mCallback->WaitForCallback(kCallbackNameOnError);
ASSERT_NE(FingerprintError::ERROR_NO_ERROR, res.args->error);
// The START message and onAcquired_2_2 method should exist and work together correctly.
// Note, this test doesn't use the HAL. It just makes sure that the newly added constant and
// callback compile. Unfortunately, there is no way to test the usage of the constant within the
// actual HAL.
TEST_P(FingerprintHidlTest, acquiredInfoStartTest) {
mCallback->SetWaitTimeoutDefault(kTimeout);
mCallback->onAcquired_2_2(0 /* deviceId */, hidl_interface_2_2::FingerprintAcquiredInfo::START,
0 /* vendorCode */);
auto res = mCallback->WaitForCallback(kCallbackNameOnAcquired);
ASSERT_EQ(hidl_interface_2_2::FingerprintAcquiredInfo::START, res.args->info);
}
} // anonymous namespace