From b6fee1e5d14d969ba42e3bdaf0e1f98ae6ca4d56 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Thu, 12 Jan 2023 12:57:38 +0200 Subject: [PATCH] eqs: fingerprint: run clang-format Change-Id: I77db837cb84f8e0f69be6e484e3c2b4a4a0fa8f2 --- fingerprint/.clang-format | 14 ++++++++++++ fingerprint/BiometricsFingerprint.cpp | 31 ++++++++++++++++----------- fingerprint/BiometricsFingerprint.h | 25 +++++++++++---------- fingerprint/service.cpp | 1 + 4 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 fingerprint/.clang-format diff --git a/fingerprint/.clang-format b/fingerprint/.clang-format new file mode 100644 index 0000000..5d8d909 --- /dev/null +++ b/fingerprint/.clang-format @@ -0,0 +1,14 @@ +BasedOnStyle: Google +AccessModifierOffset: -2 +AllowShortFunctionsOnASingleLine: Inline +ColumnLimit: 99 +CommentPragmas: NOLINT:.* +DerivePointerAlignment: false +IndentWidth: 4 +PointerAlignment: Right +TabWidth: 4 +UseTab: Never +PenaltyExcessCharacter: 32 +AllowShortIfStatementsOnASingleLine: false +SpacesBeforeTrailingComments: 2 + diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 11affbc..cde5c9b 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -17,16 +17,16 @@ #include "BiometricsFingerprint.h" -#include #include -#include -#include -#include - #include #include #include +#include +#include +#include +#include + #define NOTIFY_FINGER_UP IMotFodEventType::FINGER_UP #define NOTIFY_FINGER_DOWN IMotFodEventType::FINGER_DOWN @@ -40,9 +40,11 @@ namespace implementation { void BiometricsFingerprint::disableHighBrightFod() { std::lock_guard lock(mSetHbmFodMutex); - if(!hbmFodEnabled) return; + if (!hbmFodEnabled) + return; + mMotoFingerprint->sendFodEvent(NOTIFY_FINGER_UP, {}, - [](IMotFodEventResult, const hidl_vec&) {}); + [](IMotFodEventResult, const hidl_vec &) {}); hbmFodEnabled = false; } @@ -50,9 +52,11 @@ void BiometricsFingerprint::disableHighBrightFod() { void BiometricsFingerprint::enableHighBrightFod() { std::lock_guard lock(mSetHbmFodMutex); - if(hbmFodEnabled) return; + if (hbmFodEnabled) + return; + mMotoFingerprint->sendFodEvent(NOTIFY_FINGER_DOWN, {}, - [](IMotFodEventResult, const hidl_vec&) {}); + [](IMotFodEventResult, const hidl_vec &) {}); hbmFodEnabled = true; } @@ -64,7 +68,8 @@ BiometricsFingerprint::BiometricsFingerprint() { hbmFodEnabled = false; } -Return BiometricsFingerprint::setNotify(const sp& clientCallback) { +Return BiometricsFingerprint::setNotify( + const sp &clientCallback) { return biometrics_2_1_service->setNotify(clientCallback); } @@ -72,7 +77,8 @@ Return BiometricsFingerprint::preEnroll() { return biometrics_2_1_service->preEnroll(); } -Return BiometricsFingerprint::enroll(const hidl_array& hat, uint32_t gid, uint32_t timeoutSec) { +Return BiometricsFingerprint::enroll(const hidl_array &hat, + uint32_t gid, uint32_t timeoutSec) { return biometrics_2_1_service->enroll(hat, gid, timeoutSec); } @@ -98,7 +104,8 @@ Return BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) return biometrics_2_1_service->remove(gid, fid); } -Return BiometricsFingerprint::setActiveGroup(uint32_t gid, const hidl_string& storePath) { +Return BiometricsFingerprint::setActiveGroup(uint32_t gid, + const hidl_string &storePath) { return biometrics_2_1_service->setActiveGroup(gid, storePath); } diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h index 0d05225..a76a20e 100644 --- a/fingerprint/BiometricsFingerprint.h +++ b/fingerprint/BiometricsFingerprint.h @@ -18,9 +18,9 @@ #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H #include +#include #include #include -#include namespace android { namespace hardware { @@ -29,32 +29,35 @@ namespace fingerprint { namespace V2_3 { namespace implementation { -using IBiometricsFingerprint_2_1 = ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; -using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; -using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; +using IBiometricsFingerprint_2_1 = + ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; +using ::android::sp; using ::android::hardware::hidl_array; using ::android::hardware::hidl_memory; using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; using ::android::hardware::Return; using ::android::hardware::Void; -using ::android::sp; -using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotoFingerPrint; -using ::com::motorola::hardware::biometric::fingerprint::V1_0::IMotFodEventType; +using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; +using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; 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 { BiometricsFingerprint(); // Methods from ::V2_1::IBiometricsFingerprint follow. - Return setNotify(const sp& clientCallback) override; + Return setNotify( + const sp &clientCallback) override; Return preEnroll() override; - Return enroll(const hidl_array& hat, uint32_t gid, uint32_t timeoutSec) override; + Return enroll(const hidl_array &hat, uint32_t gid, + uint32_t timeoutSec) override; Return postEnroll() override; Return getAuthenticatorId() override; Return cancel() override; Return enumerate() override; Return remove(uint32_t gid, uint32_t fid) override; - Return setActiveGroup(uint32_t gid, const hidl_string& storePath) override; + Return setActiveGroup(uint32_t gid, const hidl_string &storePath) override; Return authenticate(uint64_t operationId, uint32_t gid) override; // ::V2_3::IBiometricsFingerprint follow. @@ -62,7 +65,7 @@ struct BiometricsFingerprint : public IBiometricsFingerprint { Return onFingerDown(uint32_t x, uint32_t y, float minor, float major) override; Return onFingerUp() override; -private: + private: void disableHighBrightFod(); void enableHighBrightFod(); diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp index 356e837..34ff311 100644 --- a/fingerprint/service.cpp +++ b/fingerprint/service.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.eqs" #include #include + #include "BiometricsFingerprint.h" using android::hardware::configureRpcThreadpool;