Commit 234c8021 authored by Blaster4385's avatar Blaster4385
Browse files

nicky: Fingerprint: Uprev to 2.3 fingerprint hidl

parent b26c4d4e

device.mk

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ PRODUCT_PACKAGES += \ 


# Fingerprint

PRODUCT_PACKAGES += \

    android.hardware.biometrics.fingerprint@2.1-service.nicky

    android.hardware.biometrics.fingerprint@2.3-service.nicky



# Gatekeeper

PRODUCT_PACKAGES += \

fingerprint/Android.bp

+5 −3
Original line number Diff line number Diff line 
cc_binary {

    name: "android.hardware.biometrics.fingerprint@2.1-service.nicky",

    name: "android.hardware.biometrics.fingerprint@2.3-service.nicky",

    defaults: ["hidl_defaults"],

    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.nicky.rc"],

    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.nicky.xml"],

    init_rc: ["android.hardware.biometrics.fingerprint@2.3-service.nicky.rc"],

    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.3-service.nicky.xml"],

    relative_install_path: "hw",

    srcs: [

        "BiometricsFingerprint.cpp",
@@ -19,6 +19,8 @@ cc_binary { 
        "libutils",

        "libbase",

        "android.hardware.biometrics.fingerprint@2.1",

        "android.hardware.biometrics.fingerprint@2.2",

        "android.hardware.biometrics.fingerprint@2.3",

        "vendor.oplus.hardware.biometrics.fingerprint@2.1",

    ],

    vendor: true

fingerprint/BiometricsFingerprint.cpp

+17 −4
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.nicky"

#define LOG_VERBOSE "android.hardware.biometrics.fingerprint@2.1-service.nicky"

#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.nicky"

#define LOG_VERBOSE "android.hardware.biometrics.fingerprint@2.3-service.nicky"



#include <hardware/hardware.h>

#include <hardware/fingerprint.h>
@@ -29,7 +29,7 @@ namespace android { 
namespace hardware {

namespace biometrics {

namespace fingerprint {

namespace V2_1 {

namespace V2_3 {

namespace implementation {



BiometricsFingerprint::BiometricsFingerprint() {
@@ -259,8 +259,21 @@ Return<RequestStatus> BiometricsFingerprint::authenticate(uint64_t operationId, 
    return OplusToAOSPRequestStatus(mOplusBiometricsFingerprint->authenticate(operationId, gid));

}



Return<bool> BiometricsFingerprint::isUdfps(uint32_t /*sensorId*/) {

    return false;

}



Return<void> BiometricsFingerprint::onFingerDown(uint32_t /*x*/, uint32_t /*y*/, float /*minor*/,

                                                 float /*major*/) {

    return Void();

}



Return<void> BiometricsFingerprint::onFingerUp() {

    return Void();

}



} // namespace implementation

}  // namespace V2_1

}  // namespace V2_3

}  // namespace fingerprint

}  // namespace biometrics

}  // namespace hardware

fingerprint/BiometricsFingerprint.h

+11 −6
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H

#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H

#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H

#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_3_BIOMETRICSFINGERPRINT_H



#include <log/log.h>

#include <android/log.h>
@@ -23,7 +23,7 @@ 
#include <hardware/fingerprint.h>

#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>

#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>

#include <android/hardware/biometrics/fingerprint/2.3/IBiometricsFingerprint.h>

#include <android/hardware/biometrics/fingerprint/2.1/types.h>

#include <vendor/oplus/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
@@ -31,10 +31,12 @@ namespace android { 
namespace hardware {

namespace biometrics {

namespace fingerprint {

namespace V2_1 {

namespace V2_3 {

namespace implementation {



using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;

using ::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo;

using ::android::hardware::biometrics::fingerprint::V2_1::FingerprintError;

using ::android::hardware::biometrics::fingerprint::V2_3::IBiometricsFingerprint;

using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;

using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus;

using ::android::hardware::Return;
@@ -71,6 +73,9 @@ public: 
    Return<RequestStatus> getAlikeyStatus();

    Return<RequestStatus> getEnrollmentTotalTimes();

    Return<RequestStatus> getEngineeringInfo(uint32_t type);

    Return<bool> isUdfps(uint32_t sensorId) override;

    Return<void> onFingerDown(uint32_t x, uint32_t y, float minor, float major) override;

    Return<void> onFingerUp() override;



private:

    sp<vendor::oplus::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint> mOplusBiometricsFingerprint;
@@ -79,7 +84,7 @@ private: 
};



}  // namespace implementation

}  // namespace V2_1

}  // namespace V2_3

}  // namespace fingerprint

}  // namespace biometrics

}  // namespace hardware

fingerprint/android.hardware.biometrics.fingerprint@2.1-service.nicky.rc→fingerprint/android.hardware.biometrics.fingerprint@2.3-service.nicky.rc

+1 −1
Original line number Diff line number Diff line 
service vendor.fps_hal.nicky /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.nicky

service vendor.fps_hal.nicky /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.3-service.nicky

    # "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

    # /data is mounted.