commit c5d5b7d4ea4c2dea2848e2f1a92537bbba11b0ba
author Jeffrey Vander Stoep <jeffv@google.com> Fri Dec 23 11:28:28 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 23 11:28:28 2022 +0000
tree ce176cbf451eb5bcdb019f737f3e83925de68d4c
parent 93e97f94b67e6ab9e994fc642ad204cd670d9a71

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

diff --git a/biometrics/fingerprint/aidl/default/fingerprint-example.rc b/biometrics/fingerprint/aidl/default/fingerprint-example.rc
index 80985e8..10db00d 100644
--- a/biometrics/fingerprint/aidl/default/fingerprint-example.rc
+++ b/biometrics/fingerprint/aidl/default/fingerprint-example.rc
@@ -2,7 +2,8 @@
     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

biometrics/fingerprint/aidl/default/main.cpp

diff --git a/biometrics/fingerprint/aidl/default/main.cpp b/biometrics/fingerprint/aidl/default/main.cpp
index 11bce15..0e672b1 100644
--- a/biometrics/fingerprint/aidl/default/main.cpp
+++ b/biometrics/fingerprint/aidl/default/main.cpp
@@ -28,8 +28,7 @@
     std::shared_ptr<Fingerprint> hal = ndk::SharedRefBase::make<Fingerprint>();
 
     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();