commit 533c94cb704e3f16f7fc53ec071d673da469c318
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 29 01:14:23 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 29 01:14:23 2017 +0000
tree d26ab1ce65dc7cf4541b05bf00d513c6ed8af91d
parent f5f555522b6a1d617c3e9db7d3bb04d78bb3f7be
parent 8b76a6b90dacd2b330fae4bac274d463542d04ba

Merge "Remove subdirs" into oc-mr1-dev-plus-aosp

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");
     }

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
index b5f036e..060b9ee 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
@@ -19,6 +19,11 @@
 void RadioHidlTest::SetUp() {
     radio =
         ::testing::VtsHalHidlTargetTestBase::getService<IRadio>(hidl_string(RADIO_SERVICE_NAME));
+    if (radio == NULL) {
+        sleep(60);
+        radio = ::testing::VtsHalHidlTargetTestBase::getService<IRadio>(
+            hidl_string(RADIO_SERVICE_NAME));
+    }
     ASSERT_NE(nullptr, radio.get());
 
     radioRsp = new (std::nothrow) RadioResponse(*this);