From 99af8deb5f0dd75980112e4c1445b3a53f325d54 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Sat, 30 Oct 2021 08:30:42 +0200 Subject: [PATCH] hidl: fingerprint: Uprev to 2.3 * Move fingerprint HIDL to 2.3 * Remove Lineage FOD HIDL [Linux4: Autodetect if fingerprint is udfps] Change-Id: I8c628d2ee9158b45eeb04dd324b56ef3697296b7 --- hidl/fingerprint/Android.mk | 9 +- hidl/fingerprint/BiometricsFingerprint.cpp | 26 ++- hidl/fingerprint/BiometricsFingerprint.h | 23 ++- ...etrics.fingerprint@2.3-service.samsung.rc} | 2 +- ...trics.fingerprint@2.3-service.samsung.xml} | 8 +- hidl/fingerprint/inscreen/Android.mk | 44 ------ .../inscreen/FingerprintInscreen.cpp | 148 ------------------ .../inscreen/FingerprintInscreen.h | 68 -------- .../include/samsung_fingerprint_inscreen.h | 35 ----- hidl/fingerprint/inscreen/service.cpp | 50 ------ ...ingerprint.inscreen@1.0-service.samsung.rc | 6 - hidl/fingerprint/service.cpp | 6 +- 12 files changed, 51 insertions(+), 374 deletions(-) rename hidl/fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.samsung.rc => android.hardware.biometrics.fingerprint@2.3-service.samsung.rc} (91%) rename hidl/fingerprint/{inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.xml => android.hardware.biometrics.fingerprint@2.3-service.samsung.xml} (50%) delete mode 100644 hidl/fingerprint/inscreen/Android.mk delete mode 100644 hidl/fingerprint/inscreen/FingerprintInscreen.cpp delete mode 100644 hidl/fingerprint/inscreen/FingerprintInscreen.h delete mode 100644 hidl/fingerprint/inscreen/include/samsung_fingerprint_inscreen.h delete mode 100644 hidl/fingerprint/inscreen/service.cpp delete mode 100644 hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.rc diff --git a/hidl/fingerprint/Android.mk b/hidl/fingerprint/Android.mk index 91a0f3c4..db4650a3 100644 --- a/hidl/fingerprint/Android.mk +++ b/hidl/fingerprint/Android.mk @@ -28,7 +28,9 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ liblog \ libutils \ - android.hardware.biometrics.fingerprint@2.1 + android.hardware.biometrics.fingerprint@2.1 \ + android.hardware.biometrics.fingerprint@2.2 \ + android.hardware.biometrics.fingerprint@2.3 ifeq ($(TARGET_SEC_FP_CALL_NOTIFY_ON_CANCEL),true) LOCAL_CFLAGS += -DCALL_NOTIFY_ON_CANCEL @@ -42,8 +44,9 @@ ifeq ($(TARGET_SEC_FP_CALL_CANCEL_ON_ENROLL_COMPLETION),true) LOCAL_CFLAGS += -DCALL_CANCEL_ON_ENROLL_COMPLETION endif -LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-service.samsung -LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service.samsung.rc +LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.3-service.samsung +LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.3-service.samsung.rc +LOCAL_VINTF_FRAGMENTS := android.hardware.biometrics.fingerprint@2.3-service.samsung.xml LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := samsung diff --git a/hidl/fingerprint/BiometricsFingerprint.cpp b/hidl/fingerprint/BiometricsFingerprint.cpp index b38575de..3825ee21 100644 --- a/hidl/fingerprint/BiometricsFingerprint.cpp +++ b/hidl/fingerprint/BiometricsFingerprint.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.samsung" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.samsung" #include @@ -24,6 +24,7 @@ #include "BiometricsFingerprint.h" #include +#include #include #include @@ -31,7 +32,7 @@ namespace android { namespace hardware { namespace biometrics { namespace fingerprint { -namespace V2_1 { +namespace V2_3 { namespace implementation { using RequestStatus = android::hardware::biometrics::fingerprint::V2_1::RequestStatus; @@ -43,6 +44,11 @@ BiometricsFingerprint::BiometricsFingerprint() : mClientCallback(nullptr) { if (!openHal()) { LOG(ERROR) << "Can't open HAL module"; } + + std::ifstream in("/sys/devices/virtual/fingerprint/fingerprint/position"); + mIsUdfps = !!in; + if (in) + in.close(); } BiometricsFingerprint::~BiometricsFingerprint() { @@ -51,6 +57,18 @@ BiometricsFingerprint::~BiometricsFingerprint() { } } +Return BiometricsFingerprint::isUdfps(uint32_t) { + return mIsUdfps; +} + +Return BiometricsFingerprint::onFingerDown(uint32_t, uint32_t, float, float) { + return Void(); +} + +Return BiometricsFingerprint::onFingerUp() { + return Void(); +} + Return BiometricsFingerprint::ErrorFilter(int32_t error) { switch (error) { case 0: @@ -146,7 +164,7 @@ Return BiometricsFingerprint::setNotify( const sp& clientCallback) { std::lock_guard lock(mClientCallbackMutex); mClientCallback = clientCallback; - // This is here because HAL 2.1 doesn't have a way to propagate a + // This is here because HAL 2.3 doesn't have a way to propagate a // unique token for its driver. Subsequent versions should send a unique // token for each call to setNotify(). This is fine as long as there's only // one fingerprint device on the platform. @@ -368,7 +386,7 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) { } } // namespace implementation -} // namespace V2_1 +} // namespace V2_3 } // namespace fingerprint } // namespace biometrics } // namespace hardware diff --git a/hidl/fingerprint/BiometricsFingerprint.h b/hidl/fingerprint/BiometricsFingerprint.h index 4848a33c..7f688884 100644 --- a/hidl/fingerprint/BiometricsFingerprint.h +++ b/hidl/fingerprint/BiometricsFingerprint.h @@ -14,20 +14,21 @@ * limitations under the License. */ -#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H -#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H +#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H +#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H -#include #include #include #include #include +#include +#include namespace android { namespace hardware { namespace biometrics { namespace fingerprint { -namespace V2_1 { +namespace V2_3 { namespace implementation { using ::android::sp; @@ -35,8 +36,10 @@ using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; using ::android::hardware::Return; using ::android::hardware::Void; -using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; +using ::android::hardware::biometrics::fingerprint::V2_3::IBiometricsFingerprint; using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; +using ::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo; +using ::android::hardware::biometrics::fingerprint::V2_1::FingerprintError; using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; struct BiometricsFingerprint : public IBiometricsFingerprint { @@ -46,7 +49,7 @@ struct BiometricsFingerprint : public IBiometricsFingerprint { // 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_3::IBiometricsFingerprint follow. Return setNotify( const sp& clientCallback) override; Return preEnroll() override; @@ -59,6 +62,9 @@ struct BiometricsFingerprint : public IBiometricsFingerprint { Return remove(uint32_t gid, uint32_t fid) override; Return setActiveGroup(uint32_t gid, const hidl_string& storePath) override; Return authenticate(uint64_t operationId, uint32_t gid) override; + Return isUdfps(uint32_t sensorID) override; + Return onFingerDown(uint32_t x, uint32_t y, float minor, float major) override; + Return onFingerUp() override; private: bool openHal(); @@ -71,6 +77,7 @@ struct BiometricsFingerprint : public IBiometricsFingerprint { std::mutex mClientCallbackMutex; sp mClientCallback; + bool mIsUdfps; int (*ss_fingerprint_close)(); int (*ss_fingerprint_open)(const char* id); @@ -88,10 +95,10 @@ struct BiometricsFingerprint : public IBiometricsFingerprint { }; } // namespace implementation -} // namespace V2_1 +} // namespace V2_3 } // namespace fingerprint } // namespace biometrics } // namespace hardware } // namespace android -#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H +#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H diff --git a/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.samsung.rc b/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc similarity index 91% rename from hidl/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.samsung.rc rename to hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc index dbc30439..a011f8a2 100644 --- a/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.samsung.rc +++ b/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.samsung +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.samsung # "class hal" causes a race condition on some devices due to files created # in /data. As a workaround, postpone startup until later in boot once # /data is mounted. diff --git a/hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.xml b/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml similarity index 50% rename from hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.xml rename to hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml index e03c70cb..26f02cd3 100644 --- a/hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.xml +++ b/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml @@ -1,10 +1,10 @@ - - vendor.lineage.biometrics.fingerprint.inscreen + + android.hardware.biometrics.fingerprint hwbinder - 1.0 + 2.3 - IFingerprintInscreen + IBiometricsFingerprint default diff --git a/hidl/fingerprint/inscreen/Android.mk b/hidl/fingerprint/inscreen/Android.mk deleted file mode 100644 index c19fb109..00000000 --- a/hidl/fingerprint/inscreen/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2020 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - FingerprintInscreen.cpp \ - service.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libhardware \ - libhidlbase \ - liblog \ - libhwbinder \ - libutils \ - vendor.lineage.biometrics.fingerprint.inscreen@1.0 - -LOCAL_MODULE := vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung -LOCAL_INIT_RC := vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.rc -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_OWNER := samsung -LOCAL_VINTF_FRAGMENTS := vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.xml -LOCAL_VENDOR_MODULE := true - -include $(BUILD_EXECUTABLE) diff --git a/hidl/fingerprint/inscreen/FingerprintInscreen.cpp b/hidl/fingerprint/inscreen/FingerprintInscreen.cpp deleted file mode 100644 index 224c48aa..00000000 --- a/hidl/fingerprint/inscreen/FingerprintInscreen.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "FingerprintInscreenService" - -#include "FingerprintInscreen.h" - -#include -#include - -#include - -namespace vendor { -namespace lineage { -namespace biometrics { -namespace fingerprint { -namespace inscreen { -namespace V1_0 { -namespace implementation { - -/* - * Write value to path and close file. - */ -template -static void set(const std::string& path, const T& value) { - std::ofstream file(path); - - if (!file) { - PLOG(ERROR) << "Failed to open: " << path; - return; - } - - LOG(DEBUG) << "write: " << path << " value: " << value; - - file << value << std::endl; - - if (!file) { - PLOG(ERROR) << "Failed to write: " << path << " value: " << value; - } -} - -template -static T get(const std::string& path, const T& def) { - std::ifstream file(path); - - if (!file) { - PLOG(ERROR) << "Failed to open: " << path; - return def; - } - - T result; - - file >> result; - - if (file.fail()) { - PLOG(ERROR) << "Failed to read: " << path; - return def; - } else { - LOG(DEBUG) << "read: " << path << " value: " << result; - return result; - } -} - -FingerprintInscreen::FingerprintInscreen() { -#ifdef FOD_SET_RECT - set(TSP_CMD_PATH, FOD_SET_RECT); -#endif - set(TSP_CMD_PATH, FOD_ENABLE); -} - -Return FingerprintInscreen::onStartEnroll() { return Void(); } - -Return FingerprintInscreen::onFinishEnroll() { return Void(); } - -Return FingerprintInscreen::onPress() { return Void(); } - -Return FingerprintInscreen::onRelease() { return Void(); } - -Return FingerprintInscreen::onShowFODView() { return Void(); } - -Return FingerprintInscreen::onHideFODView() { return Void(); } - -Return FingerprintInscreen::handleAcquired(int32_t acquiredInfo, int32_t vendorCode) { - std::lock_guard _lock(mCallbackLock); - - if (mCallback == nullptr) { - return false; - } - - if (acquiredInfo == FINGERPRINT_ACQUIRED_VENDOR) { - if (vendorCode == VENDORCODE_FINGER_DOWN) { - Return ret = mCallback->onFingerDown(); - if (!ret.isOk()) { - LOG(ERROR) << "FingerDown() error: " << ret.description(); - } - return true; - } else if (vendorCode == VENDORCODE_FINGER_UP) { - Return ret = mCallback->onFingerUp(); - if (!ret.isOk()) { - LOG(ERROR) << "FingerUp() error: " << ret.description(); - } - return true; - } - } - - return false; -} - -Return FingerprintInscreen::handleError(int32_t, int32_t) { return false; } - -Return FingerprintInscreen::setLongPressEnabled(bool) { return Void(); } - -Return FingerprintInscreen::getDimAmount(int32_t) { return 0; } - -Return FingerprintInscreen::shouldBoostBrightness() { return false; } - -Return FingerprintInscreen::setCallback(const sp& callback) { - mCallback = callback; - - return Void(); -} - -Return FingerprintInscreen::getPositionX() { return FOD_SENSOR_X; } - -Return FingerprintInscreen::getPositionY() { return FOD_SENSOR_Y; } - -Return FingerprintInscreen::getSize() { return FOD_SENSOR_SIZE; } - -} // namespace implementation -} // namespace V1_0 -} // namespace inscreen -} // namespace fingerprint -} // namespace biometrics -} // namespace lineage -} // namespace vendor diff --git a/hidl/fingerprint/inscreen/FingerprintInscreen.h b/hidl/fingerprint/inscreen/FingerprintInscreen.h deleted file mode 100644 index be357034..00000000 --- a/hidl/fingerprint/inscreen/FingerprintInscreen.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef VENDOR_LINEAGE_BIOMETRICS_FINGERPRINT_INSCREEN_V1_0_FINGERPRINTINSCREEN_H -#define VENDOR_LINEAGE_BIOMETRICS_FINGERPRINT_INSCREEN_V1_0_FINGERPRINTINSCREEN_H - -#include - -#include "samsung_fingerprint_inscreen.h" - -namespace vendor { -namespace lineage { -namespace biometrics { -namespace fingerprint { -namespace inscreen { -namespace V1_0 { -namespace implementation { - -using ::android::sp; -using ::android::hardware::Return; -using ::android::hardware::Void; - -class FingerprintInscreen : public IFingerprintInscreen { - public: - FingerprintInscreen(); - - Return onStartEnroll() override; - Return onFinishEnroll() override; - Return onPress() override; - Return onRelease() override; - Return onShowFODView() override; - Return onHideFODView() override; - Return handleAcquired(int32_t acquiredInfo, int32_t vendorCode) override; - Return handleError(int32_t error, int32_t vendorCode) override; - Return setLongPressEnabled(bool enabled) override; - Return getDimAmount(int32_t cur_brightness) override; - Return shouldBoostBrightness() override; - Return setCallback(const sp& callback) override; - Return getPositionX() override; - Return getPositionY() override; - Return getSize() override; - - private: - std::mutex mCallbackLock; - sp mCallback; -}; - -} // namespace implementation -} // namespace V1_0 -} // namespace inscreen -} // namespace fingerprint -} // namespace biometrics -} // namespace lineage -} // namespace vendor - -#endif // VENDOR_LINEAGE_BIOMETRICS_FINGERPRINT_INSCREEN_V1_0_FINGERPRINTINSCREEN_H diff --git a/hidl/fingerprint/inscreen/include/samsung_fingerprint_inscreen.h b/hidl/fingerprint/inscreen/include/samsung_fingerprint_inscreen.h deleted file mode 100644 index 72b616d2..00000000 --- a/hidl/fingerprint/inscreen/include/samsung_fingerprint_inscreen.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef SAMSUNG_FINGERPRINT_INSCREEN_H -#define SAMSUNG_FINGERPRINT_INSCREEN_H - -#define FOD_SENSOR_X 435 -#define FOD_SENSOR_Y 2025 -#define FOD_SENSOR_SIZE 210 - -#define FOD_ENABLE "fod_enable,1,1" -#define FOD_DISABLE "fod_enable,0" - -// #define FOD_SET_RECT "set_fod_rect,554,2263,886,2595" - -#define FINGERPRINT_ACQUIRED_VENDOR 6 -#define VENDORCODE_FINGER_DOWN 9002 -#define VENDORCODE_FINGER_UP 9001 - -#define TSP_CMD_PATH "/sys/class/sec/tsp/cmd" - -#endif // SAMSUNG_FINGERPRINT_INSCREEN_H diff --git a/hidl/fingerprint/inscreen/service.cpp b/hidl/fingerprint/inscreen/service.cpp deleted file mode 100644 index 1a678952..00000000 --- a/hidl/fingerprint/inscreen/service.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "lineage.biometrics.fingerprint.inscreen@1.0-service.samsung" - -#include -#include - -#include "FingerprintInscreen.h" - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; - -using vendor::lineage::biometrics::fingerprint::inscreen::V1_0::IFingerprintInscreen; -using vendor::lineage::biometrics::fingerprint::inscreen::V1_0::implementation::FingerprintInscreen; - -using android::OK; -using android::status_t; - -int main() { - android::sp service = new FingerprintInscreen(); - - configureRpcThreadpool(1, true); - - status_t status = service->registerAsService(); - if (status != OK) { - LOG(ERROR) << "Cannot register FOD HAL service."; - return 1; - } - - LOG(INFO) << "FOD HAL service ready."; - - joinRpcThreadpool(); - - LOG(ERROR) << "FOD HAL service failed to join thread pool."; - return 1; -} diff --git a/hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.rc b/hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.rc deleted file mode 100644 index 6b453642..00000000 --- a/hidl/fingerprint/inscreen/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.rc +++ /dev/null @@ -1,6 +0,0 @@ -service vendor.fingerprint-inscreen-1-0 /vendor/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung - interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default - class hal - user system - group system - shutdown critical diff --git a/hidl/fingerprint/service.cpp b/hidl/fingerprint/service.cpp index 09d51115..af1113d9 100644 --- a/hidl/fingerprint/service.cpp +++ b/hidl/fingerprint/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.samsung" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.samsung" #include #include @@ -25,8 +25,8 @@ using android::hardware::configureRpcThreadpool; using android::hardware::joinRpcThreadpool; -using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; -using android::hardware::biometrics::fingerprint::V2_1::implementation::BiometricsFingerprint; +using android::hardware::biometrics::fingerprint::V2_3::IBiometricsFingerprint; +using android::hardware::biometrics::fingerprint::V2_3::implementation::BiometricsFingerprint; using android::OK; using android::sp;