Merge "Change method name."
diff --git a/test/lazy_test/hidl_lazy_test.cpp b/test/lazy_test/hidl_lazy_test.cpp
index 354d27f..0a1aba9 100644
--- a/test/lazy_test/hidl_lazy_test.cpp
+++ b/test/lazy_test/hidl_lazy_test.cpp
@@ -151,7 +151,7 @@
}
}
-TEST_F(HidlLazyTest, ActiveServicesCountCallbackTest) {
+TEST_F(HidlLazyTest, ActiveServicesCallbackTest) {
sp<ILazy> lazy;
for (const auto& instance : gInstances) {
@@ -162,7 +162,7 @@
}
if (!lazy) GTEST_SKIP() << "Services under test do not include ILazy";
- ASSERT_TRUE(lazy->setCustomActiveServicesCountCallback().isOk());
+ ASSERT_TRUE(lazy->setCustomActiveServicesCallback().isOk());
}
int main(int argc, char** argv) {
diff --git a/test/lazy_test/hidl_lazy_test_server.cpp b/test/lazy_test/hidl_lazy_test_server.cpp
index c6346d0..50f8b0f 100644
--- a/test/lazy_test/hidl_lazy_test_server.cpp
+++ b/test/lazy_test/hidl_lazy_test_server.cpp
@@ -27,13 +27,13 @@
class Lazy : public ILazy {
public:
- ::android::hardware::Return<void> setCustomActiveServicesCountCallback();
+ ::android::hardware::Return<void> setCustomActiveServicesCallback();
};
-::android::hardware::Return<void> Lazy::setCustomActiveServicesCountCallback() {
+::android::hardware::Return<void> Lazy::setCustomActiveServicesCallback() {
auto lazyRegistrar = android::hardware::LazyServiceRegistrar::getInstance();
- lazyRegistrar.setActiveServicesCountCallback([lazyRegistrar](int count) mutable -> bool {
- if (count != 0) {
+ lazyRegistrar.setActiveServicesCallback([lazyRegistrar](bool hasClients) mutable -> bool {
+ if (hasClients) {
return false;
}