From 6823dd80e017a6638ebf5858ab542e0f25f19156 Mon Sep 17 00:00:00 2001 From: Chris Phoenix Date: Thu, 19 Jan 2017 15:51:29 -0800 Subject: [PATCH] vibrator 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; verify HAL still works Bug: 33844934 Change-Id: I0c22f99133418658eadca8e1cae8218cf2277cf1 --- vibrator/1.0/default/Vibrator.cpp | 8 ++++---- vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp | 4 +--- .../testcases/hal/vibrator/hidl/host/VibratorHidlTest.py | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/vibrator/1.0/default/Vibrator.cpp b/vibrator/1.0/default/Vibrator.cpp index e86e68152d..8c82bcd5d6 100644 --- a/vibrator/1.0/default/Vibrator.cpp +++ b/vibrator/1.0/default/Vibrator.cpp @@ -50,18 +50,18 @@ Return Vibrator::off() { return Status::OK; } -IVibrator* HIDL_FETCH_IVibrator(const char *hal) { +IVibrator* HIDL_FETCH_IVibrator(const char * /*hal*/) { vibrator_device_t *vib_device; const hw_module_t *hw_module = nullptr; - int ret = hw_get_module(hal, &hw_module); + int ret = hw_get_module(VIBRATOR_HARDWARE_MODULE_ID, &hw_module); if (ret == 0) { ret = vibrator_open(hw_module, &vib_device); if (ret != 0) { - ALOGE("vibrator_open %s failed: %d", hal, ret); + ALOGE("vibrator_open failed: %d", ret); } } else { - ALOGE("hw_get_module %s failed: %d", hal, ret); + ALOGE("hw_get_module %s failed: %d", VIBRATOR_HARDWARE_MODULE_ID, ret); } if (ret == 0) { diff --git a/vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp b/vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp index ec8db3a9b7..782a7636a1 100644 --- a/vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp +++ b/vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp @@ -28,13 +28,11 @@ using ::android::hardware::Return; using ::android::hardware::Void; using ::android::sp; -#define VIBRATOR_SERVICE_NAME "vibrator" - // The main test class for VIBRATOR HIDL HAL. class VibratorHidlTest : public ::testing::Test { public: virtual void SetUp() override { - vibrator = IVibrator::getService(VIBRATOR_SERVICE_NAME, false); + vibrator = IVibrator::getService(false); ASSERT_NE(vibrator, nullptr); } diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py index 498ea060c9..84f2907b1b 100644 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py +++ b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py @@ -45,7 +45,6 @@ class VibratorHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): target_version=1.0, target_package="android.hardware.vibrator", target_component_name="IVibrator", - hw_binder_service_name="vibrator", bits=64 if self.dut.is64Bit else 32) def tearDownClass(self):