commit bbeae6fe23e96a658ac6413a2f468fed2913753b
author Chih-Hung Hsieh <chh@google.com> Wed Nov 29 00:19:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 29 00:19:02 2017 +0000
tree bd1c1ec5fcc97956a1b2e6f891e39a7fca9084d6
parent 553821046f55fbf0055a21b2a46fa64a9e4c56af
parent f5f555522b6a1d617c3e9db7d3bb04d78bb3f7be

Use -Werror in hardware/interfaces/biometrics/fingerprint am: 5631258f07 am: a5d28736f4
am: f5f555522b

Change-Id: Ic3bc06c4a3a404f395ced8a64b04d4d27905d3b7

biometrics/fingerprint/2.1/default/Android.bp

diff --git a/biometrics/fingerprint/2.1/default/Android.bp b/biometrics/fingerprint/2.1/default/Android.bp
index e1d2cf7..b12ce61 100644
--- a/biometrics/fingerprint/2.1/default/Android.bp
+++ b/biometrics/fingerprint/2.1/default/Android.bp
@@ -1,5 +1,6 @@
 cc_binary {
     name: "android.hardware.biometrics.fingerprint@2.1-service",
+    defaults: ["hidl_defaults"],
     init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.rc"],
     vendor: true,
     relative_install_path: "hw",

biometrics/fingerprint/2.1/default/service.cpp

diff --git a/biometrics/fingerprint/2.1/default/service.cpp b/biometrics/fingerprint/2.1/default/service.cpp
index 1697c07..edfaac4 100644
--- a/biometrics/fingerprint/2.1/default/service.cpp
+++ b/biometrics/fingerprint/2.1/default/service.cpp
@@ -35,7 +35,9 @@
     configureRpcThreadpool(1, true /*callerWillJoin*/);
 
     if (bio != nullptr) {
-        bio->registerAsService();
+        if (::android::OK != bio->registerAsService()) {
+            return 1;
+        }
     } else {
         ALOGE("Can't create instance of BiometricsFingerprint, nullptr");
     }