* Move fingerprint HIDL to 2.3 * Remove Lineage FOD HIDL [Linux4: Autodetect if fingerprint is udfps] Change-Id: I8c628d2ee9158b45eeb04dd324b56ef3697296b7tirimbino
TheScarastic
3 years ago
committed by
Tim Zimmermann
parent
5a7577b20c
commit
99af8deb5f
@ -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 |
# "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 |
# in /data. As a workaround, postpone startup until later in boot once |
||||||
# /data is mounted. |
# /data is mounted. |
||||||
@ -1,10 +1,10 @@ |
|||||||
<manifest version="1.0" type="device"> |
<manifest version="1.0" type="device"> |
||||||
<hal format="hidl"> |
<hal format="hidl" override="true"> |
||||||
<name>vendor.lineage.biometrics.fingerprint.inscreen</name> |
<name>android.hardware.biometrics.fingerprint</name> |
||||||
<transport>hwbinder</transport> |
<transport>hwbinder</transport> |
||||||
<version>1.0</version> |
<version>2.3</version> |
||||||
<interface> |
<interface> |
||||||
<name>IFingerprintInscreen</name> |
<name>IBiometricsFingerprint</name> |
||||||
<instance>default</instance> |
<instance>default</instance> |
||||||
</interface> |
</interface> |
||||||
</hal> |
</hal> |
||||||
@ -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) |
|
||||||
@ -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 <android-base/logging.h> |
|
||||||
#include <hidl/HidlTransportSupport.h> |
|
||||||
|
|
||||||
#include <fstream> |
|
||||||
|
|
||||||
namespace vendor { |
|
||||||
namespace lineage { |
|
||||||
namespace biometrics { |
|
||||||
namespace fingerprint { |
|
||||||
namespace inscreen { |
|
||||||
namespace V1_0 { |
|
||||||
namespace implementation { |
|
||||||
|
|
||||||
/*
|
|
||||||
* Write value to path and close file. |
|
||||||
*/ |
|
||||||
template <typename T> |
|
||||||
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 <typename T> |
|
||||||
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<void> FingerprintInscreen::onStartEnroll() { return Void(); } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::onFinishEnroll() { return Void(); } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::onPress() { return Void(); } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::onRelease() { return Void(); } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::onShowFODView() { return Void(); } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::onHideFODView() { return Void(); } |
|
||||||
|
|
||||||
Return<bool> FingerprintInscreen::handleAcquired(int32_t acquiredInfo, int32_t vendorCode) { |
|
||||||
std::lock_guard<std::mutex> _lock(mCallbackLock); |
|
||||||
|
|
||||||
if (mCallback == nullptr) { |
|
||||||
return false; |
|
||||||
} |
|
||||||
|
|
||||||
if (acquiredInfo == FINGERPRINT_ACQUIRED_VENDOR) { |
|
||||||
if (vendorCode == VENDORCODE_FINGER_DOWN) { |
|
||||||
Return<void> ret = mCallback->onFingerDown(); |
|
||||||
if (!ret.isOk()) { |
|
||||||
LOG(ERROR) << "FingerDown() error: " << ret.description(); |
|
||||||
} |
|
||||||
return true; |
|
||||||
} else if (vendorCode == VENDORCODE_FINGER_UP) { |
|
||||||
Return<void> ret = mCallback->onFingerUp(); |
|
||||||
if (!ret.isOk()) { |
|
||||||
LOG(ERROR) << "FingerUp() error: " << ret.description(); |
|
||||||
} |
|
||||||
return true; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
return false; |
|
||||||
} |
|
||||||
|
|
||||||
Return<bool> FingerprintInscreen::handleError(int32_t, int32_t) { return false; } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::setLongPressEnabled(bool) { return Void(); } |
|
||||||
|
|
||||||
Return<int32_t> FingerprintInscreen::getDimAmount(int32_t) { return 0; } |
|
||||||
|
|
||||||
Return<bool> FingerprintInscreen::shouldBoostBrightness() { return false; } |
|
||||||
|
|
||||||
Return<void> FingerprintInscreen::setCallback(const sp<IFingerprintInscreenCallback>& callback) { |
|
||||||
mCallback = callback; |
|
||||||
|
|
||||||
return Void(); |
|
||||||
} |
|
||||||
|
|
||||||
Return<int32_t> FingerprintInscreen::getPositionX() { return FOD_SENSOR_X; } |
|
||||||
|
|
||||||
Return<int32_t> FingerprintInscreen::getPositionY() { return FOD_SENSOR_Y; } |
|
||||||
|
|
||||||
Return<int32_t> FingerprintInscreen::getSize() { return FOD_SENSOR_SIZE; } |
|
||||||
|
|
||||||
} // namespace implementation
|
|
||||||
} // namespace V1_0
|
|
||||||
} // namespace inscreen
|
|
||||||
} // namespace fingerprint
|
|
||||||
} // namespace biometrics
|
|
||||||
} // namespace lineage
|
|
||||||
} // namespace vendor
|
|
||||||
@ -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 <vendor/lineage/biometrics/fingerprint/inscreen/1.0/IFingerprintInscreen.h> |
|
||||||
|
|
||||||
#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<void> onStartEnroll() override; |
|
||||||
Return<void> onFinishEnroll() override; |
|
||||||
Return<void> onPress() override; |
|
||||||
Return<void> onRelease() override; |
|
||||||
Return<void> onShowFODView() override; |
|
||||||
Return<void> onHideFODView() override; |
|
||||||
Return<bool> handleAcquired(int32_t acquiredInfo, int32_t vendorCode) override; |
|
||||||
Return<bool> handleError(int32_t error, int32_t vendorCode) override; |
|
||||||
Return<void> setLongPressEnabled(bool enabled) override; |
|
||||||
Return<int32_t> getDimAmount(int32_t cur_brightness) override; |
|
||||||
Return<bool> shouldBoostBrightness() override; |
|
||||||
Return<void> setCallback(const sp<IFingerprintInscreenCallback>& callback) override; |
|
||||||
Return<int32_t> getPositionX() override; |
|
||||||
Return<int32_t> getPositionY() override; |
|
||||||
Return<int32_t> getSize() override; |
|
||||||
|
|
||||||
private: |
|
||||||
std::mutex mCallbackLock; |
|
||||||
sp<IFingerprintInscreenCallback> 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
|
|
||||||
@ -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
|
|
||||||
@ -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 <android-base/logging.h> |
|
||||||
#include <hidl/HidlTransportSupport.h> |
|
||||||
|
|
||||||
#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<IFingerprintInscreen> 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; |
|
||||||
} |
|
||||||
@ -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 |
|
||||||
Loading…
Reference in new issue