diff options
| -rw-r--r-- | biometrics/Android.bp | 34 | ||||
| -rw-r--r-- | biometrics/BiometricsFingerprint.cpp | 402 | ||||
| -rw-r--r-- | biometrics/BiometricsFingerprint.h | 84 | ||||
| -rw-r--r-- | biometrics/Hardware.h | 58 | ||||
| -rw-r--r-- | biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc | 17 | ||||
| -rw-r--r-- | biometrics/service.cpp | 51 | ||||
| -rw-r--r-- | device.mk | 4 | ||||
| -rw-r--r-- | proprietary-files.txt | 8 | ||||
| -rwxr-xr-x | rootdir/etc/init.target.rc | 2 | ||||
| -rw-r--r-- | rootdir/etc/ueventd.qcom.rc | 6 |
10 files changed, 652 insertions, 14 deletions
diff --git a/biometrics/Android.bp b/biometrics/Android.bp new file mode 100644 index 0000000..d6d1362 --- /dev/null +++ b/biometrics/Android.bp @@ -0,0 +1,34 @@ +// +// Copyright (C) 2017-2018 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. + +cc_binary { + name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne", + relative_install_path: "hw", + defaults: ["hidl_defaults"], + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc"], + srcs: ["service.cpp", "BiometricsFingerprint.cpp"], + shared_libs: [ + "libbase", + "libcutils", + "libhardware", + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "android.hardware.biometrics.fingerprint@2.1", + ], + proprietary: true, +} diff --git a/biometrics/BiometricsFingerprint.cpp b/biometrics/BiometricsFingerprint.cpp new file mode 100644 index 0000000..c6e976e --- /dev/null +++ b/biometrics/BiometricsFingerprint.cpp @@ -0,0 +1,402 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * Copyright (C) 2018 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 "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne" + +#include <cutils/properties.h> + +#include <hardware/hw_auth_token.h> + +#include <hardware/hardware.h> +#include <hardware/fingerprint.h> +#include "BiometricsFingerprint.h" +#include "Hardware.h" + +#include <inttypes.h> +#include <unistd.h> + +namespace android { +namespace hardware { +namespace biometrics { +namespace fingerprint { +namespace V2_1 { +namespace implementation { + +// Supported fingerprint HAL version +static const uint16_t kVersion = HARDWARE_MODULE_API_VERSION(2, 1); + +using RequestStatus = + android::hardware::biometrics::fingerprint::V2_1::RequestStatus; + +BiometricsFingerprint *BiometricsFingerprint::sInstance = nullptr; + +BiometricsFingerprint::BiometricsFingerprint() : mClientCallback(nullptr), mDevice(nullptr) { + sInstance = this; // keep track of the most recent instance + mDevice = openHal(); + if (!mDevice) { + ALOGE("Can't open HAL module"); + } +} + +BiometricsFingerprint::~BiometricsFingerprint() { + ALOGV("~BiometricsFingerprint()"); + if (mDevice == nullptr) { + ALOGE("No valid device"); + return; + } + int err; + if (0 != (err = mDevice->common.close( + reinterpret_cast<hw_device_t*>(mDevice)))) { + ALOGE("Can't close fingerprint module, error: %d", err); + return; + } + mDevice = nullptr; +} + +Return<RequestStatus> BiometricsFingerprint::ErrorFilter(int32_t error) { + switch(error) { + case 0: return RequestStatus::SYS_OK; + case -2: return RequestStatus::SYS_ENOENT; + case -4: return RequestStatus::SYS_EINTR; + case -5: return RequestStatus::SYS_EIO; + case -11: return RequestStatus::SYS_EAGAIN; + case -12: return RequestStatus::SYS_ENOMEM; + case -13: return RequestStatus::SYS_EACCES; + case -14: return RequestStatus::SYS_EFAULT; + case -16: return RequestStatus::SYS_EBUSY; + case -22: return RequestStatus::SYS_EINVAL; + case -28: return RequestStatus::SYS_ENOSPC; + case -110: return RequestStatus::SYS_ETIMEDOUT; + default: + ALOGE("An unknown error returned from fingerprint vendor library: %d", error); + return RequestStatus::SYS_UNKNOWN; + } +} + +// Translate from errors returned by traditional HAL (see fingerprint.h) to +// HIDL-compliant FingerprintError. +FingerprintError BiometricsFingerprint::VendorErrorFilter(int32_t error, + int32_t* vendorCode) { + *vendorCode = 0; + switch(error) { + case FINGERPRINT_ERROR_HW_UNAVAILABLE: + return FingerprintError::ERROR_HW_UNAVAILABLE; + case FINGERPRINT_ERROR_UNABLE_TO_PROCESS: + return FingerprintError::ERROR_UNABLE_TO_PROCESS; + case FINGERPRINT_ERROR_TIMEOUT: + return FingerprintError::ERROR_TIMEOUT; + case FINGERPRINT_ERROR_NO_SPACE: + return FingerprintError::ERROR_NO_SPACE; + case FINGERPRINT_ERROR_CANCELED: + return FingerprintError::ERROR_CANCELED; + case FINGERPRINT_ERROR_UNABLE_TO_REMOVE: + return FingerprintError::ERROR_UNABLE_TO_REMOVE; + case FINGERPRINT_ERROR_LOCKOUT: + return FingerprintError::ERROR_LOCKOUT; + default: + if (error >= FINGERPRINT_ERROR_VENDOR_BASE) { + // vendor specific code. + *vendorCode = error - FINGERPRINT_ERROR_VENDOR_BASE; + return FingerprintError::ERROR_VENDOR; + } + } + ALOGE("Unknown error from fingerprint vendor library: %d", error); + return FingerprintError::ERROR_UNABLE_TO_PROCESS; +} + +// Translate acquired messages returned by traditional HAL (see fingerprint.h) +// to HIDL-compliant FingerprintAcquiredInfo. +FingerprintAcquiredInfo BiometricsFingerprint::VendorAcquiredFilter( + int32_t info, int32_t* vendorCode) { + *vendorCode = 0; + switch(info) { + case FINGERPRINT_ACQUIRED_GOOD: + return FingerprintAcquiredInfo::ACQUIRED_GOOD; + case FINGERPRINT_ACQUIRED_PARTIAL: + return FingerprintAcquiredInfo::ACQUIRED_PARTIAL; + case FINGERPRINT_ACQUIRED_INSUFFICIENT: + return FingerprintAcquiredInfo::ACQUIRED_INSUFFICIENT; + case FINGERPRINT_ACQUIRED_IMAGER_DIRTY: + return FingerprintAcquiredInfo::ACQUIRED_IMAGER_DIRTY; + case FINGERPRINT_ACQUIRED_TOO_SLOW: + return FingerprintAcquiredInfo::ACQUIRED_TOO_SLOW; + case FINGERPRINT_ACQUIRED_TOO_FAST: + return FingerprintAcquiredInfo::ACQUIRED_TOO_FAST; + default: + if (info >= FINGERPRINT_ACQUIRED_VENDOR_BASE) { + // vendor specific code. + *vendorCode = info - FINGERPRINT_ACQUIRED_VENDOR_BASE; + return FingerprintAcquiredInfo::ACQUIRED_VENDOR; + } + } + ALOGE("Unknown acquiredmsg from fingerprint vendor library: %d", info); + return FingerprintAcquiredInfo::ACQUIRED_INSUFFICIENT; +} + +Return<uint64_t> BiometricsFingerprint::setNotify( + const sp<IBiometricsFingerprintClientCallback>& clientCallback) { + std::lock_guard<std::mutex> lock(mClientCallbackMutex); + mClientCallback = clientCallback; + // This is here because HAL 2.1 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. + return reinterpret_cast<uint64_t>(mDevice); +} + +Return<uint64_t> BiometricsFingerprint::preEnroll() { + return mDevice->pre_enroll(mDevice); +} + +Return<RequestStatus> BiometricsFingerprint::enroll(const hidl_array<uint8_t, 69>& hat, + uint32_t gid, uint32_t timeoutSec) { + const hw_auth_token_t* authToken = + reinterpret_cast<const hw_auth_token_t*>(hat.data()); + return ErrorFilter(mDevice->enroll(mDevice, authToken, gid, timeoutSec)); +} + +Return<RequestStatus> BiometricsFingerprint::postEnroll() { + return ErrorFilter(mDevice->post_enroll(mDevice)); +} + +Return<uint64_t> BiometricsFingerprint::getAuthenticatorId() { + return mDevice->get_authenticator_id(mDevice); +} + +Return<RequestStatus> BiometricsFingerprint::cancel() { + return ErrorFilter(mDevice->cancel(mDevice)); +} + +Return<RequestStatus> BiometricsFingerprint::enumerate() { + return ErrorFilter(mDevice->enumerate(mDevice)); +} + +Return<RequestStatus> BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) { + return ErrorFilter(mDevice->remove(mDevice, gid, fid)); +} + +Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid, + const hidl_string& storePath) { + if (storePath.size() >= PATH_MAX || storePath.size() <= 0) { + ALOGE("Bad path length: %zd", storePath.size()); + return RequestStatus::SYS_EINVAL; + } + if (access(storePath.c_str(), W_OK)) { + return RequestStatus::SYS_EINVAL; + } + + return ErrorFilter(mDevice->set_active_group(mDevice, gid, + storePath.c_str())); +} + +Return<RequestStatus> BiometricsFingerprint::authenticate(uint64_t operationId, + uint32_t gid) { + return ErrorFilter(mDevice->authenticate(mDevice, operationId, gid)); +} + +IBiometricsFingerprint* BiometricsFingerprint::getInstance() { + if (!sInstance) { + sInstance = new BiometricsFingerprint(); + } + return sInstance; +} + +fingerprint_device_t* getDeviceForVendor(const char *class_name) +{ + const hw_module_t *hw_module = nullptr; + int err; + + if (!strcmp(class_name, "fpc")) { + err = load("/system/vendor/lib64/hw/fingerprint.fpc.so", &hw_module); + } else if (!strcmp(class_name, "goodix")) { + err = load("/system/vendor/lib64/hw/fingerprint.goodix.so", &hw_module); + } else { + ALOGE("No fingerprint module class specified."); + err = 1; + } + + if (err) { + ALOGE("Failed to get fingerprint module: class %s, error %d", class_name, err); + return nullptr; + } + + if (hw_module == nullptr) { + ALOGE("No valid fingerprint module: class %s", class_name); + return nullptr; + } + + 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: class %s", class_name); + return nullptr; + } + + hw_device_t *device = nullptr; + + err = fp_module->common.methods->open(hw_module, nullptr, &device); + if (err) { + ALOGE("Can't open fingerprint methods, class %s, error: %d", class_name, err); + return nullptr; + } + + if (kVersion != device->version) { + ALOGE("Wrong fingerprint version: expected %d, got %d", kVersion, device->version); + return nullptr; + } + + fingerprint_device_t *fp_device = + reinterpret_cast<fingerprint_device_t*>(device); + + ALOGI("Loaded fingerprint module: class %s", class_name); + return fp_device; +} + +fingerprint_device_t* getFingerprintDevice() +{ + fingerprint_device_t *fp_device; + char class_name[PROPERTY_VALUE_MAX]; + + property_get("ro.boot.fingerprint", + class_name, NULL); + + fp_device = getDeviceForVendor(class_name); + if (fp_device == nullptr) { + ALOGE("Failed to load %s fingerprint module", class_name); + } else { + return fp_device; + } + return nullptr; +} + +fingerprint_device_t* BiometricsFingerprint::openHal() { + int err; + + fingerprint_device_t *fp_device; + fp_device = getFingerprintDevice(); + if (fp_device == nullptr) { + return nullptr; + } + + if (0 != (err = + fp_device->set_notify(fp_device, BiometricsFingerprint::notify))) { + ALOGE("Can't register fingerprint module callback, error: %d", err); + return nullptr; + } + + return fp_device; +} + +void BiometricsFingerprint::notify(const fingerprint_msg_t *msg) { + BiometricsFingerprint* thisPtr = 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."); + return; + } + const uint64_t devId = reinterpret_cast<uint64_t>(thisPtr->mDevice); + switch (msg->type) { + case FINGERPRINT_ERROR: { + int32_t vendorCode = 0; + FingerprintError result = VendorErrorFilter(msg->data.error, &vendorCode); + ALOGD("onError(%d)", result); + if (!thisPtr->mClientCallback->onError(devId, result, vendorCode).isOk()) { + ALOGE("failed to invoke fingerprint onError callback"); + } + } + break; + case FINGERPRINT_ACQUIRED: { + int32_t vendorCode = 0; + FingerprintAcquiredInfo result = + 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"); + } + } + break; + case FINGERPRINT_TEMPLATE_ENROLLING: + 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()) { + ALOGE("failed to invoke fingerprint onEnrollResult callback"); + } + break; + case FINGERPRINT_TEMPLATE_REMOVED: + 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()) { + ALOGE("failed to invoke fingerprint onRemoved callback"); + } + break; + case FINGERPRINT_AUTHENTICATED: + if (msg->data.authenticated.finger.fid != 0) { + ALOGD("onAuthenticated(fid=%d, gid=%d)", + msg->data.authenticated.finger.fid, + 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))); + if (!thisPtr->mClientCallback->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()) { + ALOGE("failed to invoke fingerprint onAuthenticated callback"); + } + } + break; + case FINGERPRINT_TEMPLATE_ENUMERATING: + 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()) { + ALOGE("failed to invoke fingerprint onEnumerate callback"); + } + break; + } +} + +} // namespace implementation +} // namespace V2_1 +} // namespace fingerprint +} // namespace biometrics +} // namespace hardware +} // namespace android diff --git a/biometrics/BiometricsFingerprint.h b/biometrics/BiometricsFingerprint.h new file mode 100644 index 0000000..6d64e3d --- /dev/null +++ b/biometrics/BiometricsFingerprint.h @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2017 The Android Open Source 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 ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H +#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H + +#include <log/log.h> +#include <android/log.h> +#include <hardware/hardware.h> +#include <hardware/fingerprint.h> +#include <hidl/MQDescriptor.h> +#include <hidl/Status.h> +#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h> + +namespace android { +namespace hardware { +namespace biometrics { +namespace fingerprint { +namespace V2_1 { +namespace implementation { + +using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; +using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback; +using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus; +using ::android::hardware::Return; +using ::android::hardware::Void; +using ::android::hardware::hidl_vec; +using ::android::hardware::hidl_string; +using ::android::sp; + +struct BiometricsFingerprint : public IBiometricsFingerprint { +public: + BiometricsFingerprint(); + ~BiometricsFingerprint(); + + // Method to wrap legacy HAL with BiometricsFingerprint class + static IBiometricsFingerprint* getInstance(); + + // Methods from ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint follow. + Return<uint64_t> setNotify(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; + Return<RequestStatus> postEnroll() override; + Return<uint64_t> getAuthenticatorId() override; + Return<RequestStatus> cancel() override; + Return<RequestStatus> enumerate() override; + Return<RequestStatus> remove(uint32_t gid, uint32_t fid) override; + Return<RequestStatus> setActiveGroup(uint32_t gid, const hidl_string& storePath) override; + Return<RequestStatus> authenticate(uint64_t operationId, uint32_t gid) override; + +private: + static fingerprint_device_t* openHal(); + static void notify(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); + static BiometricsFingerprint* sInstance; + + std::mutex mClientCallbackMutex; + sp<IBiometricsFingerprintClientCallback> mClientCallback; + fingerprint_device_t *mDevice; +}; + +} // namespace implementation +} // namespace V2_1 +} // namespace fingerprint +} // namespace biometrics +} // namespace hardware +} // namespace android + +#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H diff --git a/biometrics/Hardware.h b/biometrics/Hardware.h new file mode 100644 index 0000000..90a6067 --- /dev/null +++ b/biometrics/Hardware.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2017, 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 _CUSTOM_HARDWARE_H +#define _CUSTOM_HARDWARE_H + +#include <dlfcn.h> + +#include <cutils/log.h> + +#include <utils/threads.h> + +static union { + const fingerprint_module_t *module; + const hw_module_t *hw_module; +} vendor; + +static int load(const char *path, + const struct hw_module_t **pHmi) +{ + int status = 0; + void *handle = NULL; + struct hw_module_t *hmi = NULL; + + ALOGE("Opening vendor module from : %s", path); + handle = dlopen(path, RTLD_NOW); + if (handle == NULL) { + status = -EINVAL; + goto done; + } + + hmi = (struct hw_module_t *)dlsym(handle, + HAL_MODULE_INFO_SYM_AS_STR); + if (hmi == NULL) { + status = -EINVAL; + goto done; + } + + hmi->dso = handle; + +done: + *pHmi = hmi; + + return status; +} +#endif /* _CUSTOM_HARDWARE_H */ diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc new file mode 100644 index 0000000..b878940 --- /dev/null +++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc @@ -0,0 +1,17 @@ +on boot + # Fingerprint + chown system system /dev/goodix_fp + chmod 0644 /dev/goodix_fp + chown system system /sys/devices/soc/soc:fpc1020/fingerdown_wait + chmod 0220 /sys/devices/soc/soc:fpc1020/fingerdown_wait + chown system system /sys/devices/soc/soc:fpc1020/irq + chmod 0660 /sys/devices/soc/soc:fpc1020/irq + chown system system /sys/devices/soc/soc:fpc1020/hw_reset + chmod 0660 /sys/devices/soc/soc:fpc1020/hw_reset + chown system system /sys/devices/soc/soc:fpc1020/wakeup_enable + chmod 0660 /sys/devices/soc/soc:fpc1020/wakeup_enable + +service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne + class late_start + user system + group system input diff --git a/biometrics/service.cpp b/biometrics/service.cpp new file mode 100644 index 0000000..ca36c46 --- /dev/null +++ b/biometrics/service.cpp @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2017 The Android Open Source 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 "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne" + +#include <android/log.h> +#include <hidl/HidlTransportSupport.h> + +#include "BiometricsFingerprint.h" + +// libhwbinder: +using android::hardware::configureRpcThreadpool; +using android::hardware::joinRpcThreadpool; + +// Generated HIDL files +using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint; +using android::hardware::biometrics::fingerprint::V2_1::implementation::BiometricsFingerprint; + +int main() { + android::sp<IBiometricsFingerprint> service = BiometricsFingerprint::getInstance(); + + if (service == nullptr) { + ALOGE("Instance of BiometricsFingerprint is null"); + return 1; + } + + configureRpcThreadpool(1, true /*callerWillJoin*/); + + android::status_t status = service->registerAsService(); + if (status != android::OK) { + ALOGE("Cannot register BiometricsFingerprint service"); + return 1; + } + + joinRpcThreadpool(); + + return 0; // should never get here +} @@ -128,6 +128,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml +# Biometrics +PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne + # Bluetooth PRODUCT_PACKAGES += \ libbt-vendor diff --git a/proprietary-files.txt b/proprietary-files.txt index 5eee313..aeed2ae 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -810,12 +810,8 @@ vendor/lib64/vendor.qti.esepowermanager@1.0_vendor.so vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so # Fingerprint - from wayne -vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service -vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc -vendor/lib/hw/fingerprint.goodix.default.so -vendor/lib64/hw/fingerprint.default.so -vendor/lib64/hw/fingerprint.fpc.default.so -vendor/lib64/hw/fingerprint.goodix.default.so +vendor/lib64/hw/fingerprint.default.so:vendor/lib64/hw/fingerprint.goodix.so +vendor/lib64/hw/fingerprint.fpc.default.so:vendor/lib64/hw/fingerprint.fpc.so vendor/lib64/com.fingerprints.extension@1.0.so vendor/lib64/libgoodixfingerprintd_binder.so vendor/lib64/libgf_ca.so diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index 2f9f8b4..963dd95 100755 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -65,8 +65,6 @@ on fs chown system system /persist/wlan_bt/wlan.mac write /sys/kernel/boot_adsp/boot 1 - chown system system /dev/goodix_fp - #chmod 0644 /dev/goodix_fp chmod 0664 /sys/class/thermal/thermal_message/sconfig chown system system /sys/class/thermal/thermal_message/sconfig diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc index cdc46e7..91a7145 100644 --- a/rootdir/etc/ueventd.qcom.rc +++ b/rootdir/etc/ueventd.qcom.rc @@ -137,12 +137,6 @@ /dev/system_health_monitor 0644 radio system /dev/mdss_rotator 0664 system system -# fpc fingerprint -/sys/devices/soc/soc:fpc1020* hw_reset 0660 system system -/sys/devices/soc/soc:fpc1020* irq 0660 system system -/sys/devices/soc/soc:fpc1020* wakeup_enable 0660 system system -/sys/devices/soc/soc:fpc1020* fingerdown_wait 0220 system system - # wlan /dev/wcnss_wlan 0660 system system /dev/wcnss_ctrl 0660 system system |