From c5d5b7d4ea4c2dea2848e2f1a92537bbba11b0ba Mon Sep 17 00:00:00 2001 From: Jeffrey Vander Stoep Date: Fri, 23 Dec 2022 11:28:28 +0000 Subject: [PATCH] Revert "Make virtual fingerprint Hal as a lazy Hal" This reverts commit 93e97f94b67e6ab9e994fc642ad204cd670d9a71. Reason for revert: b/263519851 Change-Id: I24a9921c806013c5a50bb0674690b67beca172f0 --- biometrics/fingerprint/aidl/default/fingerprint-example.rc | 7 ++++--- biometrics/fingerprint/aidl/default/main.cpp | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/biometrics/fingerprint/aidl/default/fingerprint-example.rc b/biometrics/fingerprint/aidl/default/fingerprint-example.rc index 80985e84b6..10db00d0f5 100644 --- a/biometrics/fingerprint/aidl/default/fingerprint-example.rc +++ b/biometrics/fingerprint/aidl/default/fingerprint-example.rc @@ -2,7 +2,8 @@ service vendor.fingerprint-example /vendor/bin/hw/android.hardware.biometrics.fi class hal user nobody group nobody - interface aidl android.hardware.biometrics.fingerprint.IFingerprint/virtual - oneshot disabled - +on property:ro.vendor.fingerprint_virtual_hal_start=true + enable vendor.fingerprint-example +on property:persist.vendor.fingerprint.virtual.type=* + enable vendor.fingerprint-example diff --git a/biometrics/fingerprint/aidl/default/main.cpp b/biometrics/fingerprint/aidl/default/main.cpp index 11bce15be9..0e672b10ab 100644 --- a/biometrics/fingerprint/aidl/default/main.cpp +++ b/biometrics/fingerprint/aidl/default/main.cpp @@ -28,8 +28,7 @@ int main() { std::shared_ptr hal = ndk::SharedRefBase::make(); const std::string instance = std::string(Fingerprint::descriptor) + "/virtual"; - binder_status_t status = - AServiceManager_registerLazyService(hal->asBinder().get(), instance.c_str()); + binder_status_t status = AServiceManager_addService(hal->asBinder().get(), instance.c_str()); CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool();