Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b8ea049 authored by Jeff Pu's avatar Jeff Pu
Browse files

Added UltraSonic UDFPS fingerprint sensor support in Virtual HAL 

Bug: 381174839
Test: atest android.hardware.biometrics.fingerprint.* -c
Change-Id: Icbc0e439d9e508f1cbb133cfe353f5f47184e959
parent 9d462b25

biometrics/fingerprint/aidl/default/Fingerprint.cpp

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ Fingerprint::Fingerprint() : mWorker(MAX_WORKER_QUEUE_SIZE) { 
    } else if (sensorTypeProp == "udfps") {

        mSensorType = FingerprintSensorType::UNDER_DISPLAY_OPTICAL;

        mEngine = std::make_unique<FakeFingerprintEngineUdfps>();

    } else if (sensorTypeProp == "udfps-us") {

        mSensorType = FingerprintSensorType::UNDER_DISPLAY_ULTRASONIC;

        mEngine = std::make_unique<FakeFingerprintEngineUdfps>();

    } else if (sensorTypeProp == "side") {

        mSensorType = FingerprintSensorType::POWER_BUTTON;

        mEngine = std::make_unique<FakeFingerprintEngineSide>();
@@ -220,7 +223,7 @@ const char* Fingerprint::type2String(FingerprintSensorType type) { 
        case FingerprintSensorType::UNDER_DISPLAY_OPTICAL:

            return "udfps";

        case FingerprintSensorType::UNDER_DISPLAY_ULTRASONIC:

            return "udfps";

            return "udfps-us";

        default:

            return "unknown";

    }

biometrics/fingerprint/aidl/default/api/android.hardware.biometrics.fingerprint.VirtualProps-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -173,6 +173,6 @@ props { 
    type: String

    access: ReadWrite

    prop_name: "persist.vendor.fingerprint.virtual.type"

    enum_values: "default|rear|udfps|side"

    enum_values: "default|rear|udfps|udfps-us|side"

  }

}

biometrics/fingerprint/aidl/default/fingerprint.sysprop

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ prop { 
    type: String

    scope: Public

    access: ReadWrite

    enum_values: "default|rear|udfps|side"

    enum_values: "default|rear|udfps|udfps-us|side"

    api_name: "type"

}

biometrics/fingerprint/aidl/default/tests/VirtualHalTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ TEST_F(VirtualHalTest, type) { 
    } typeMap[] = {{FingerprintSensorType::REAR, "rear"},

                   {FingerprintSensorType::POWER_BUTTON, "side"},

                   {FingerprintSensorType::UNDER_DISPLAY_OPTICAL, "udfps"},

                   {FingerprintSensorType::UNDER_DISPLAY_ULTRASONIC, "udfps"},

                   {FingerprintSensorType::UNDER_DISPLAY_ULTRASONIC, "udfps-us"},

                   {FingerprintSensorType::UNKNOWN, "unknown"}};

    for (auto const& x : typeMap) {

        mVhal->setType(x.type);