Revert "sm8250-common: biometrics: Implement boosting on authentication"

This reverts commit 1b3fbae7b0.
This commit is contained in:
xSylla 2021-11-01 11:57:21 +01:00
parent 1b2b48fe7c
commit f8582d196e
4 changed files with 1 additions and 23 deletions

View File

@ -9,14 +9,12 @@ cc_binary {
"service.cpp",
],
shared_libs: [
"libbinder_ndk",
"libcutils",
"liblog",
"libhidlbase",
"libhardware",
"libutils",
"android.hardware.biometrics.fingerprint@2.1",
"android.hardware.power-ndk_platform",
"//hardware/xiaomi:vendor.xiaomi.hardware.fingerprintextension@1.0",
],
vendor: true,

View File

@ -42,22 +42,13 @@ static const char *kHALClasses[] = {
"goodix_fod6",
};
// Boost duration
static constexpr int kDefaultBoostDurationMs = 2000;
// Power AIDL instance name
static const std::string kPowerInstance = std::string(IPower::descriptor) + "/default";
using RequestStatus =
android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
BiometricsFingerprint *BiometricsFingerprint::sInstance = nullptr;
BiometricsFingerprint::BiometricsFingerprint() :
mClientCallback(nullptr), mPowerService(nullptr), mDevice(nullptr) {
BiometricsFingerprint::BiometricsFingerprint() : mClientCallback(nullptr), mDevice(nullptr) {
sInstance = this; // keep track of the most recent instance
mPowerService = IPower::fromBinder(ndk::SpAIBinder(
AServiceManager_getService(kPowerInstance.c_str())));
for (const auto& class_name : kHALClasses) {
mDevice = openHal(class_name);
if (!mDevice) {
@ -306,7 +297,6 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t *msg) {
break;
case FINGERPRINT_ACQUIRED: {
int32_t vendorCode = 0;
sInstance->mPowerService->setBoost(Boost::INTERACTION, kDefaultBoostDurationMs);
FingerprintAcquiredInfo result =
VendorAcquiredFilter(msg->data.acquired.acquired_info, &vendorCode);
ALOGD("onAcquired(%d)", result);

View File

@ -25,9 +25,6 @@
#include <hidl/Status.h>
#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
#include <vendor/xiaomi/hardware/fingerprintextension/1.0/IXiaomiFingerprint.h>
#include <aidl/android/hardware/power/Boost.h>
#include <aidl/android/hardware/power/IPower.h>
#include <android/binder_manager.h>
namespace android {
namespace hardware {
@ -36,8 +33,6 @@ namespace fingerprint {
namespace V2_1 {
namespace implementation {
using ::aidl::android::hardware::power::Boost;
using ::aidl::android::hardware::power::IPower;
using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;
using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;
using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
@ -82,7 +77,6 @@ private:
std::mutex mClientCallbackMutex;
sp<IBiometricsFingerprintClientCallback> mClientCallback;
std::shared_ptr<IPower> mPowerService;
xiaomi_fingerprint_device_t *mDevice;
};

View File

@ -1,9 +1,5 @@
# Allow access to the HALs
hal_client_domain(hal_fingerprint_default, vendor_hal_perf)
hal_client_domain(hal_fingerprint_default, hal_power)
# Allow binder communication with hal_power_default
binder_call(hal_fingerprint_default, hal_power_default)
# Allow binder communication with vendor_hal_perf_default
binder_call(hal_fingerprint_default, vendor_hal_perf_default)