commit 28952f593350418b76e6997e18e43b910672f6af
author Chris Phoenix <cphoenix@google.com> Mon Jan 23 20:42:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 23 20:42:53 2017 +0000
tree 768d6189da3211b7549a3af548313809c778a60a
parent 68df3d04dab05512c1656ab3bcb16a3fe0b62c2d
parent 11e847666fb7a015a25c1833e3b49b4f17cd689d

Merge "sensors HAL uses "default" service name"

sensors/1.0/default/service.cpp

diff --git a/sensors/1.0/default/service.cpp b/sensors/1.0/default/service.cpp
index f165a45..5bcfe4b 100644
--- a/sensors/1.0/default/service.cpp
+++ b/sensors/1.0/default/service.cpp
@@ -23,5 +23,5 @@
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
-    return defaultPassthroughServiceImplementation<ISensors>("sensors");
+    return defaultPassthroughServiceImplementation<ISensors>();
 }

sensors/1.0/vts/functional/sensors_hidl_hal_test.cpp

diff --git a/sensors/1.0/vts/functional/sensors_hidl_hal_test.cpp b/sensors/1.0/vts/functional/sensors_hidl_hal_test.cpp
index c7600f3..194afc2 100644
--- a/sensors/1.0/vts/functional/sensors_hidl_hal_test.cpp
+++ b/sensors/1.0/vts/functional/sensors_hidl_hal_test.cpp
@@ -41,8 +41,6 @@
 using ::android::sp;
 using namespace ::android::hardware::sensors::V1_0;
 
-#define SENSORS_SERVICE_NAME "sensors"
-
 // Test environment for sensors
 class SensorsHidlEnvironment : public ::testing::Environment {
  public:
@@ -82,7 +80,7 @@
 };
 
 void SensorsHidlEnvironment::SetUp() {
-  sensors = ISensors::getService(SENSORS_SERVICE_NAME, false);
+  sensors = ISensors::getService(false);
   ALOGI_IF(sensors, "sensors is not nullptr, %p", sensors.get());
   ASSERT_NE(sensors, nullptr);