Evolution-X-Devices/device_motorola_berlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

berlna: fingerprint: clang-format

Browse Source 
Change-Id: I1f9b4301dc776082e3866d7941a7df7b0b17b3a1
This commit is contained in:
Michael Bestas
2025-02-22 21:10:49 +02:00
committed by Nolen Johnson
parent 9f574f02ba
commit 1331f0a4bd
3 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fingerprint/.clang-format Symbolic link
View File

@@ -0,0 +1 @@
../../../../build/soong/scripts/system-clang-format

51
fingerprint/BiometricsFingerprint.cpp
View File

@@ -31,7 +31,7 @@ using RequestStatus = android::hardware::biometrics::fingerprint::V2_1::RequestS
BiometricsFingerprint* BiometricsFingerprint::sInstance = nullptr;
BiometricsFingerprint::BiometricsFingerprint() : mClientCallback(nullptr), mDevice(nullptr) {
sInstance = this; // keep track of the most recent instance
sInstance = this; // keep track of the most recent instance
mDevice = openHal();
if (!mDevice) {
ALOGE("Can't open HAL module");
@@ -194,7 +194,7 @@ Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid,
if (android::base::StartsWith(mutableStorePath, "/data/system/users/")) {
mutableStorePath = "/data/vendor_de/";
mutableStorePath +=
static_cast<std::string>(storePath).substr(strlen("/data/system/users/"));
static_cast<std::string>(storePath).substr(strlen("/data/system/users/"));
}
if (access(mutableStorePath.c_str(), W_OK)) {
return RequestStatus::SYS_EINVAL;
@@ -215,7 +215,7 @@ IBiometricsFingerprint* BiometricsFingerprint::getInstance() {
fingerprint_device_t* getDevice() {
const hw_module_t* hw_module = nullptr;
const char* className = "goodix";
const char* className = "goodix";
int err;
err = hw_get_module_by_class(FINGERPRINT_HARDWARE_MODULE_ID, className, &hw_module);
if (err) {
@@ -226,7 +226,8 @@ fingerprint_device_t* getDevice() {
ALOGE("No valid fingerprint module");
return nullptr;
}
fingerprint_module_t const* fp_module = reinterpret_cast<const fingerprint_module_t*>(hw_module);
fingerprint_module_t const* fp_module =
reinterpret_cast<const fingerprint_module_t*>(hw_module);
if (fp_module->common.methods->open == nullptr) {
ALOGE("No valid open method");
return nullptr;
@@ -273,7 +274,7 @@ fingerprint_device_t* BiometricsFingerprint::openHal() {
void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
BiometricsFingerprint* thisPtr =
static_cast<BiometricsFingerprint*>(BiometricsFingerprint::getInstance());
static_cast<BiometricsFingerprint*>(BiometricsFingerprint::getInstance());
std::lock_guard<std::mutex> lock(thisPtr->mClientCallbackMutex);
if (thisPtr == nullptr || thisPtr->mClientCallback == nullptr) {
ALOGE("Receiving callbacks before the client callback is registered.");
@@ -292,7 +293,7 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
case FINGERPRINT_ACQUIRED: {
int32_t vendorCode = 0;
FingerprintAcquiredInfo result =
VendorAcquiredFilter(msg->data.acquired.acquired_info, &vendorCode);
VendorAcquiredFilter(msg->data.acquired.acquired_info, &vendorCode);
ALOGD("onAcquired(%d)", result);
if (!thisPtr->mClientCallback->onAcquired(devId, result, vendorCode).isOk()) {
ALOGE("failed to invoke fingerprint onAcquired callback");
@@ -302,10 +303,10 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
ALOGD("onEnrollResult(fid=%d, gid=%d, rem=%d)", msg->data.enroll.finger.fid,
msg->data.enroll.finger.gid, msg->data.enroll.samples_remaining);
if (!thisPtr->mClientCallback
->onEnrollResult(devId, msg->data.enroll.finger.fid,
msg->data.enroll.finger.gid,
msg->data.enroll.samples_remaining)
.isOk()) {
->onEnrollResult(devId, msg->data.enroll.finger.fid,
msg->data.enroll.finger.gid,
msg->data.enroll.samples_remaining)
.isOk()) {
ALOGE("failed to invoke fingerprint onEnrollResult callback");
}
break;
@@ -313,9 +314,10 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
ALOGD("onRemove(fid=%d, gid=%d, rem=%d)", msg->data.removed.finger.fid,
msg->data.removed.finger.gid, msg->data.removed.remaining_templates);
if (!thisPtr->mClientCallback
->onRemoved(devId, msg->data.removed.finger.fid, msg->data.removed.finger.gid,
msg->data.removed.remaining_templates)
.isOk()) {
->onRemoved(devId, msg->data.removed.finger.fid,
msg->data.removed.finger.gid,
msg->data.removed.remaining_templates)
.isOk()) {
ALOGE("failed to invoke fingerprint onRemoved callback");
}
break;
@@ -325,19 +327,20 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
msg->data.authenticated.finger.gid);
const uint8_t* hat = reinterpret_cast<const uint8_t*>(&msg->data.authenticated.hat);
const hidl_vec<uint8_t> token(
std::vector<uint8_t>(hat, hat + sizeof(msg->data.authenticated.hat)));
std::vector<uint8_t>(hat, hat + sizeof(msg->data.authenticated.hat)));
if (!thisPtr->mClientCallback
->onAuthenticated(devId, msg->data.authenticated.finger.fid,
msg->data.authenticated.finger.gid, token)
.isOk()) {
->onAuthenticated(devId, msg->data.authenticated.finger.fid,
msg->data.authenticated.finger.gid, token)
.isOk()) {
ALOGE("failed to invoke fingerprint onAuthenticated callback");
}
} else {
// Not a recognized fingerprint
if (!thisPtr->mClientCallback
->onAuthenticated(devId, msg->data.authenticated.finger.fid,
msg->data.authenticated.finger.gid, hidl_vec<uint8_t>())
.isOk()) {
->onAuthenticated(devId, msg->data.authenticated.finger.fid,
msg->data.authenticated.finger.gid,
hidl_vec<uint8_t>())
.isOk()) {
ALOGE("failed to invoke fingerprint onAuthenticated callback");
}
}
@@ -346,10 +349,10 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
ALOGD("onEnumerate(fid=%d, gid=%d, rem=%d)", msg->data.enumerated.finger.fid,
msg->data.enumerated.finger.gid, msg->data.enumerated.remaining_templates);
if (!thisPtr->mClientCallback
->onEnumerate(devId, msg->data.enumerated.finger.fid,
msg->data.enumerated.finger.gid,
msg->data.enumerated.remaining_templates)
.isOk()) {
->onEnumerate(devId, msg->data.enumerated.finger.fid,
msg->data.enumerated.finger.gid,
msg->data.enumerated.remaining_templates)
.isOk()) {
ALOGE("failed to invoke fingerprint onEnumerate callback");
}
break;

8
fingerprint/BiometricsFingerprint.h
View File

@@ -37,9 +37,10 @@ struct BiometricsFingerprint : public IBiometricsFingerprint {
~BiometricsFingerprint();
// Method to wrap legacy HAL with BiometricsFingerprint class
static IBiometricsFingerprint* getInstance();
// Methods from ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint follow.
// Methods from ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint
// follow.
Return<uint64_t> setNotify(
const sp<IBiometricsFingerprintClientCallback>& clientCallback) override;
const sp<IBiometricsFingerprintClientCallback>& clientCallback) override;
Return<uint64_t> preEnroll() override;
Return<RequestStatus> enroll(const hidl_array<uint8_t, 69>& hat, uint32_t gid,
uint32_t timeoutSec) override;
@@ -54,7 +55,7 @@ struct BiometricsFingerprint : public IBiometricsFingerprint {
private:
static fingerprint_device_t* openHal();
static void notify(
const fingerprint_msg_t* msg); /* Static callback for legacy HAL implementation */
const fingerprint_msg_t* msg); /* Static callback for legacy HAL implementation */
static Return<RequestStatus> ErrorFilter(int32_t error);
static FingerprintError VendorErrorFilter(int32_t error, int32_t* vendorCode);
static FingerprintAcquiredInfo VendorAcquiredFilter(int32_t error, int32_t* vendorCode);
@@ -72,4 +73,3 @@ struct BiometricsFingerprint : public IBiometricsFingerprint {
} // namespace android
#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H