diff options
author | Chris Phoenix <cphoenix@google.com> | 2017-01-18 18:20:05 -0800 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2017-02-24 16:45:35 -0800 |
commit | aa011ee002adb92a9694706ec08626e0b2ad9572 (patch) | |
tree | 4c1591be3f34733444ca6b4beac8ac61ea24fab1 /vr | |
parent | 8c171a5c58aba4682518125c4659d1a6da6a7d6d (diff) | |
download | android_hardware_interfaces-aa011ee002adb92a9694706ec08626e0b2ad9572.tar.gz android_hardware_interfaces-aa011ee002adb92a9694706ec08626e0b2ad9572.tar.bz2 android_hardware_interfaces-aa011ee002adb92a9694706ec08626e0b2ad9572.zip |
Vr HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.
Test: builds
Bug: 33844934
Change-Id: I2bd735cff9674ec5955ae30efed27359041ed723
Diffstat (limited to 'vr')
-rw-r--r-- | vr/1.0/default/Vr.cpp | 6 | ||||
-rw-r--r-- | vr/1.0/default/service.cpp | 2 | ||||
-rw-r--r-- | vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/vr/1.0/default/Vr.cpp b/vr/1.0/default/Vr.cpp index a0de99835..345db9946 100644 --- a/vr/1.0/default/Vr.cpp +++ b/vr/1.0/default/Vr.cpp @@ -42,16 +42,16 @@ Return<void> Vr::setVrMode(bool enabled) { return Void(); } -IVr* HIDL_FETCH_IVr(const char *name) { +IVr* HIDL_FETCH_IVr(const char * /*name*/) { vr_module_t *vr_module; const hw_module_t *hw_module = NULL; - int ret = hw_get_module(name, &hw_module); + int ret = hw_get_module(VR_HARDWARE_MODULE_ID, &hw_module); if (ret == 0) { return new Vr(reinterpret_cast<vr_module_t*>( const_cast<hw_module_t*>(hw_module))); } else { - ALOGE("hw_get_module %s failed: %d", name, ret); + ALOGE("hw_get_module %s failed: %d", VR_HARDWARE_MODULE_ID, ret); return nullptr; } } diff --git a/vr/1.0/default/service.cpp b/vr/1.0/default/service.cpp index c27ceafed..22fb7d10e 100644 --- a/vr/1.0/default/service.cpp +++ b/vr/1.0/default/service.cpp @@ -23,5 +23,5 @@ using android::hardware::vr::V1_0::IVr; using android::hardware::defaultPassthroughServiceImplementation; int main() { - return defaultPassthroughServiceImplementation<IVr>("vr"); + return defaultPassthroughServiceImplementation<IVr>(); } diff --git a/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp b/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp index 29888fd8c..c7ec07627 100644 --- a/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp +++ b/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp @@ -26,13 +26,11 @@ using ::android::hardware::Return; using ::android::hardware::Void; using ::android::sp; -#define VR_SERVICE_NAME "vr" - // The main test class for VR HIDL HAL. class VrHidlTest : public ::testing::Test { public: void SetUp() override { - vr = IVr::getService(VR_SERVICE_NAME); + vr = IVr::getService(); ASSERT_NE(vr, nullptr); } |