From 412a9081ea5cf0f7da9203bef5475704e14b5cda Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 5 Feb 2017 12:07:00 +0100 Subject: [PATCH] msm8976-common: Remove fingerprint wrapper HAL Change-Id: I5d3f4604d9e50b09bb18c65af0c3f8f0ee387a6a --- fingerprint/Android.mk | 31 ----- fingerprint/FingerprintWrapper.cpp | 216 ----------------------------- msm8976.mk | 3 +- proprietary-files.txt | 4 +- 4 files changed, 3 insertions(+), 251 deletions(-) delete mode 100644 fingerprint/Android.mk delete mode 100644 fingerprint/FingerprintWrapper.cpp diff --git a/fingerprint/Android.mk b/fingerprint/Android.mk deleted file mode 100644 index 574a182..0000000 --- a/fingerprint/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - FingerprintWrapper.cpp - -LOCAL_SHARED_LIBRARIES := \ - libhardware liblog - -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE := fingerprint.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) diff --git a/fingerprint/FingerprintWrapper.cpp b/fingerprint/FingerprintWrapper.cpp deleted file mode 100644 index 7f69c3c..0000000 --- a/fingerprint/FingerprintWrapper.cpp +++ /dev/null @@ -1,216 +0,0 @@ -/* - * 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. - */ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "FingerprintWrapper" - -#include - -#include -#include -#include - -typedef struct { - fingerprint_device_t base; - union { - fingerprint_device_t *device; - hw_device_t *hw_device; - } vendor; -} device_t; - -static android::Mutex vendor_mutex; - -static union { - const fingerprint_module_t *module; - const hw_module_t *hw_module; -} vendor; - -static fingerprint_notify_t original_notify; - -static bool ensure_vendor_module_is_loaded(void) -{ - android::Mutex::Autolock lock(vendor_mutex); - - if (!vendor.module) { - int rv = hw_get_module_by_class("fingerprint", "vendor", &vendor.hw_module); - if (rv) { - ALOGE("failed to open vendor module, error %d", rv); - vendor.module = NULL; - } else { - ALOGI("loaded vendor module: %s version %x", vendor.module->common.name, - vendor.module->common.module_api_version); - } - } - - return vendor.module != NULL; -} - -static void hal_notify_wrapped(const fingerprint_msg_t *msg) -{ - fingerprint_msg_t *new_msg = const_cast(msg); - - switch (msg->type) { - case FINGERPRINT_TEMPLATE_ENROLLING: - new_msg->data.enroll.samples_remaining = 100 - msg->data.enroll.samples_remaining; - break; - - default: - break; - } - - return original_notify(new_msg); -} - -static int set_notify(struct fingerprint_device *dev, fingerprint_notify_t notify) -{ - device_t *device = (device_t *) dev; - - original_notify = notify; - - return device->vendor.device->set_notify(device->vendor.device, hal_notify_wrapped); -} - -static uint64_t pre_enroll(struct fingerprint_device *dev) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->pre_enroll(device->vendor.device); -} - -static int enroll(struct fingerprint_device *dev, const hw_auth_token_t *hat, uint32_t gid, - uint32_t timeout_sec) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->enroll(device->vendor.device, hat, gid, timeout_sec); -} - -static int post_enroll(struct fingerprint_device *dev) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->post_enroll(device->vendor.device); -} - -static uint64_t get_authenticator_id(struct fingerprint_device *dev) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->get_authenticator_id(device->vendor.device); -} - -static int cancel(struct fingerprint_device *dev) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->cancel(device->vendor.device); -} - -static int enumerate(struct fingerprint_device *dev) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->enumerate(device->vendor.device); -} - -static int remove(struct fingerprint_device *dev, uint32_t gid, uint32_t fid) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->remove(device->vendor.device, gid, fid); -} - -static int set_active_group(struct fingerprint_device *dev, uint32_t gid, const char *store_path) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->set_active_group(device->vendor.device, gid, store_path); -} - -static int authenticate(struct fingerprint_device *dev, uint64_t operation_id, uint32_t gid) -{ - device_t *device = (device_t *) dev; - - return device->vendor.device->authenticate(device->vendor.device, operation_id, gid); -} - -static int device_close(hw_device_t *hw_device) -{ - device_t *device = (device_t *) hw_device; - int rv = device->base.common.close(device->vendor.hw_device); - free(device); - return rv; -} - -static int device_open(const hw_module_t *module, const char *name, hw_device_t **device_out) -{ - int rv; - device_t *device; - - if (!ensure_vendor_module_is_loaded()) { - return -EINVAL; - } - - device = (device_t *) calloc(sizeof(*device), 1); - if (!device) { - ALOGE("%s: Failed to allocate memory", __func__); - return -ENOMEM; - } - - rv = vendor.module->common.methods->open(vendor.hw_module, name, &device->vendor.hw_device); - if (rv) { - ALOGE("%s: failed to open, error %d\n", __func__, rv); - free(device); - return rv; - } - - device->base.common.tag = HARDWARE_DEVICE_TAG; - device->base.common.version = device->vendor.device->common.version; - device->base.common.module = (hw_module_t *) module; - device->base.common.close = device_close; - - device->base.set_notify = set_notify; - device->base.pre_enroll = pre_enroll; - device->base.enroll = enroll; - device->base.post_enroll = post_enroll; - device->base.get_authenticator_id = get_authenticator_id; - device->base.cancel = cancel; - device->base.enumerate = enumerate; - device->base.remove = remove; - device->base.set_active_group = set_active_group; - device->base.authenticate = authenticate; - - *device_out = (hw_device_t *) device; - return 0; -} - -static struct hw_module_methods_t module_methods = { - .open = device_open -}; - -fingerprint_module_t HAL_MODULE_INFO_SYM = { - .common = { - .tag = HARDWARE_MODULE_TAG, - .module_api_version = FINGERPRINT_MODULE_API_VERSION_2_1, - .hal_api_version = HARDWARE_HAL_API_VERSION, - .id = FINGERPRINT_HARDWARE_MODULE_ID, - .name = "Lineage Fingerprint Wrapper", - .author = "The LineageOS Project", - .methods = &module_methods, - .dso = NULL, /* remove compilation warnings */ - .reserved = {0}, /* remove compilation warnings */ - }, -}; diff --git a/msm8976.mk b/msm8976.mk index b93d6f5..b355e51 100644 --- a/msm8976.mk +++ b/msm8976.mk @@ -119,8 +119,7 @@ PRODUCT_PACKAGES += \ # Fingerprint PRODUCT_PACKAGES += \ - fingerprintd \ - fingerprint.msm8952 + fingerprintd # For android_filesystem_config.h PRODUCT_PACKAGES += \ diff --git a/proprietary-files.txt b/proprietary-files.txt index d372ffc..bf2f5fe 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -247,12 +247,12 @@ vendor/lib64/libStDrvInt.so vendor/lib/libQSEEComAPI.so # FinegerPrint -lib64/hw/fingerprint.default.so:lib64/hw/fingerprint.vendor.default.so +lib64/hw/fingerprint.default.so lib64/libbauthserver.so lib64/libbauthtzcommon.so lib64/libegis_fp_normal_sensor_test.so lib64/libsynaFpSensorTestNwd.so -lib/hw/fingerprint.default.so:lib/hw/fingerprint.vendor.default.so +lib/hw/fingerprint.default.so lib/libbauthserver.so lib/libbauthtzcommon.so lib/libegis_fp_normal_sensor_test.so