commit 13387baf267a4f74996c7172f8178fb6d4eb0a52
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 24 00:14:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 24 00:14:30 2017 +0000
tree 7308c77dbeb6da9220e1d8c1dd6e86dc1cb9398b
parent 3b4c509d4a7edf2eeb6b8c7c2e306355a92689f2
parent 6d0a0911d5de40a91b05c47bf85aa76b7c617f94

Merge "light HAL uses "default" service name"

light/2.0/default/service.cpp

diff --git a/light/2.0/default/service.cpp b/light/2.0/default/service.cpp
index b3848e9..70ae565 100644
--- a/light/2.0/default/service.cpp
+++ b/light/2.0/default/service.cpp
@@ -23,5 +23,5 @@
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
-    return defaultPassthroughServiceImplementation<ILight>("light");
+    return defaultPassthroughServiceImplementation<ILight>();
 }

light/2.0/vts/functional/light_hidl_hal_test.cpp

diff --git a/light/2.0/vts/functional/light_hidl_hal_test.cpp b/light/2.0/vts/functional/light_hidl_hal_test.cpp
index 9b9f543..71a8b4e 100644
--- a/light/2.0/vts/functional/light_hidl_hal_test.cpp
+++ b/light/2.0/vts/functional/light_hidl_hal_test.cpp
@@ -34,15 +34,13 @@
 using ::android::hardware::Void;
 using ::android::sp;
 
-#define LIGHT_SERVICE_NAME "light"
-
 #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
 #define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())
 
 class LightHidlTest : public ::testing::Test {
 public:
     virtual void SetUp() override {
-        light = ILight::getService(LIGHT_SERVICE_NAME);
+        light = ILight::getService();
 
         ASSERT_NE(light, nullptr);
         LOG(INFO) << "Test is remote " << light->isRemote();