BOBtheBlinker/android_device_motorola_milanf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dubai: fingerprint: clang-format

Browse source 
Change-Id: I1f9b4301dc776082e3866d7941a7df7b0b17b3a1
This commit is contained in:
Michael Bestas 2025-02-22 21:10:49 +02:00
parent 1e080870c2
commit 4d085c0010
No known key found for this signature in database
3 changed files with 26 additions and 19 deletions
Show stats 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

21
fingerprint/BiometricsFingerprint.cpp
View file

@ -18,8 +18,8 @@
#include "BiometricsFingerprint.h" #include "BiometricsFingerprint.h"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <fstream>
#include <cmath> #include <cmath>
#include <fstream>
#include <thread> #include <thread>
#include <fcntl.h> #include <fcntl.h>
@ -69,9 +69,9 @@ BiometricsFingerprint::BiometricsFingerprint() {
} }
struct pollfd fodUiPoll = { struct pollfd fodUiPoll = {
.fd = fd, .fd = fd,
.events = POLLERR | POLLPRI, .events = POLLERR | POLLPRI,
.revents = 0, .revents = 0,
}; };
while (true) { while (true) {
@ -80,13 +80,14 @@ BiometricsFingerprint::BiometricsFingerprint() {
LOG(ERROR) << "failed to poll fd, err: " << rc; LOG(ERROR) << "failed to poll fd, err: " << rc;
continue; continue;
} }
mMotoFingerprint->sendFodEvent(readBool(fd) ? NOTIFY_FINGER_DOWN : NOTIFY_FINGER_UP , {}, mMotoFingerprint->sendFodEvent(readBool(fd) ? NOTIFY_FINGER_DOWN : NOTIFY_FINGER_UP, {},
[](IMotFodEventResult, const hidl_vec<signed char>&) {}); [](IMotFodEventResult, const hidl_vec<signed char>&) {});
} }
}).detach(); }).detach();
} }
Return<uint64_t> BiometricsFingerprint::setNotify(const sp<IBiometricsFingerprintClientCallback>& clientCallback) { Return<uint64_t> BiometricsFingerprint::setNotify(
const sp<IBiometricsFingerprintClientCallback>& clientCallback) {
return biometrics_2_1_service->setNotify(clientCallback); return biometrics_2_1_service->setNotify(clientCallback);
} }
@ -94,7 +95,8 @@ Return<uint64_t> BiometricsFingerprint::preEnroll() {
return biometrics_2_1_service->preEnroll(); return biometrics_2_1_service->preEnroll();
} }
Return<RequestStatus> BiometricsFingerprint::enroll(const hidl_array<uint8_t, 69>& hat, uint32_t gid, uint32_t timeoutSec) { Return<RequestStatus> BiometricsFingerprint::enroll(const hidl_array<uint8_t, 69>& hat,
uint32_t gid, uint32_t timeoutSec) {
return biometrics_2_1_service->enroll(hat, gid, timeoutSec); return biometrics_2_1_service->enroll(hat, gid, timeoutSec);
} }
@ -118,7 +120,8 @@ Return<RequestStatus> BiometricsFingerprint::remove(uint32_t gid, uint32_t fid)
return biometrics_2_1_service->remove(gid, fid); return biometrics_2_1_service->remove(gid, fid);
} }
Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid, const hidl_string& storePath) { Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid,
const hidl_string& storePath) {
return biometrics_2_1_service->setActiveGroup(gid, storePath); return biometrics_2_1_service->setActiveGroup(gid, storePath);
} }

23
fingerprint/BiometricsFingerprint.h
View file

@ -18,9 +18,9 @@
#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H
#include <android/hardware/biometrics/fingerprint/2.3/IBiometricsFingerprint.h> #include <android/hardware/biometrics/fingerprint/2.3/IBiometricsFingerprint.h>
#include <com/motorola/hardware/biometric/fingerprint/1.0/IMotoFingerPrint.h>
#include <hidl/MQDescriptor.h> #include <hidl/MQDescriptor.h>
#include <hidl/Status.h> #include <hidl/Status.h>
#include <com/motorola/hardware/biometric/fingerprint/1.0/IMotoFingerPrint.h>
namespace android { namespace android {
namespace hardware { namespace hardware {
@ -29,26 +29,29 @@ namespace fingerprint {
namespace V2_3 { namespace V2_3 {
namespace implementation { namespace implementation {
using IBiometricsFingerprint_2_1 = ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; using IBiometricsFingerprint_2_1 =
using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;
using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; using ::android::sp;
using ::android::hardware::hidl_array; using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory; using ::android::hardware::hidl_memory;
using ::android::hardware::hidl_string; using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec; using ::android::hardware::hidl_vec;
using ::android::hardware::Return; using ::android::hardware::Return;
using ::android::hardware::Void; using ::android::hardware::Void;
using ::android::sp; using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;
using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotoFingerPrint; using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventType;
using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventResult; using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventResult;
using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventType;
using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotoFingerPrint;
struct BiometricsFingerprint : public IBiometricsFingerprint { struct BiometricsFingerprint : public IBiometricsFingerprint {
BiometricsFingerprint(); BiometricsFingerprint();
// Methods from ::V2_1::IBiometricsFingerprint follow. // Methods from ::V2_1::IBiometricsFingerprint follow.
Return<uint64_t> setNotify(const sp<IBiometricsFingerprintClientCallback>& clientCallback) override; Return<uint64_t> setNotify(
const sp<IBiometricsFingerprintClientCallback>& clientCallback) override;
Return<uint64_t> preEnroll() override; Return<uint64_t> preEnroll() override;
Return<RequestStatus> enroll(const hidl_array<uint8_t, 69>& hat, uint32_t gid, uint32_t timeoutSec) override; Return<RequestStatus> enroll(const hidl_array<uint8_t, 69>& hat, uint32_t gid,
uint32_t timeoutSec) override;
Return<RequestStatus> postEnroll() override; Return<RequestStatus> postEnroll() override;
Return<uint64_t> getAuthenticatorId() override; Return<uint64_t> getAuthenticatorId() override;
Return<RequestStatus> cancel() override; Return<RequestStatus> cancel() override;
@ -62,7 +65,7 @@ struct BiometricsFingerprint : public IBiometricsFingerprint {
Return<void> onFingerDown(uint32_t x, uint32_t y, float minor, float major) override; Return<void> onFingerDown(uint32_t x, uint32_t y, float minor, float major) override;
Return<void> onFingerUp() override; Return<void> onFingerUp() override;
private: private:
sp<IBiometricsFingerprint_2_1> biometrics_2_1_service; sp<IBiometricsFingerprint_2_1> biometrics_2_1_service;
sp<IMotoFingerPrint> mMotoFingerprint; sp<IMotoFingerPrint> mMotoFingerprint;
}; };