Revert "land: Build fingerprint wrapper HAL"
This reverts commit 179aafa6fb.
This commit is contained in:
karthick111
Prateek Chaubey
parent
b5a70706c9
commit
e6759b6918
4 changed files with 1 additions and 264 deletions
|
|
@ -15,11 +15,9 @@ if [ "$board_id" = "S88537AC1" ]; || [ "$board_id" = "S88537EC1"]; then
|
|||
rm /system/bin/gx_fpd
|
||||
rm /system/etc/permissions/android.hardware.fingerprint.xml
|
||||
rm /system/lib/hw/fingerprint.msm8937.so
|
||||
rm /system/lib/hw/fingerprint.land.so
|
||||
rm /system/lib/libcom_fingerprints_service.so
|
||||
rm /system/lib64/hw/fingerprint.msm8937.so
|
||||
rm /system/lib64/hw/fingerprint.goodix.so
|
||||
rm /system/lib64/hw/fingerprint.land.so
|
||||
rm /system/lib64/hw/gxfingerprint.default.so
|
||||
rm /system/lib64/libcom_fingerprints_service.so
|
||||
rm /system/lib64/libfp_client.so
|
||||
|
|
|
|||
|
|
@ -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 libcutils
|
||||
|
||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||
LOCAL_MODULE := fingerprint.$(TARGET_DEVICE)
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
@ -1,229 +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 <dlfcn.h>
|
||||
|
||||
#include <cutils/log.h>
|
||||
#include <cutils/properties.h>
|
||||
|
||||
#include <hardware/hardware.h>
|
||||
#include <hardware/fingerprint.h>
|
||||
#include <utils/threads.h>
|
||||
|
||||
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 int load(const char *path,
|
||||
const struct hw_module_t **pHmi)
|
||||
{
|
||||
int status = 0;
|
||||
void *handle = NULL;
|
||||
struct hw_module_t *hmi = NULL;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
static bool ensure_vendor_module_is_loaded(void)
|
||||
{
|
||||
android::Mutex::Autolock lock(vendor_mutex);
|
||||
|
||||
if (!vendor.module) {
|
||||
|
||||
int rv;
|
||||
char vend [PROPERTY_VALUE_MAX];
|
||||
property_get("persist.sys.fp.vendor", vend, NULL);
|
||||
|
||||
|
||||
if (!strcmp(vend, "goodix")) {
|
||||
rv = load("/system/lib64/hw/fingerprint.goodix.so", &vendor.hw_module);
|
||||
} else {
|
||||
rv = load("/system/lib64/hw/fingerprint.msm8937.so", &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 int set_notify(struct fingerprint_device *dev, fingerprint_notify_t notify)
|
||||
{
|
||||
device_t *device = (device_t *) dev;
|
||||
|
||||
return device->vendor.device->set_notify(device->vendor.device, notify);
|
||||
}
|
||||
|
||||
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 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.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_0,
|
||||
.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 */
|
||||
},
|
||||
};
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
# Fingerprint
|
||||
PRODUCT_PACKAGES += \
|
||||
fingerprintd \
|
||||
fingerprint.land
|
||||
fingerprintd
|
||||
|
||||
# Permissions
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
|
|||
Loading…
Reference in a new issue