Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "vibrator HAL uses "default" service name"

Browse Source
This commit is contained in:
Chris Phoenix
2017-01-21 02:51:31 +00:00
committed by Android (Google) Code Review
parent b2a560a17e 6823dd80e0
commit 272e495c4d
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vibrator/1.0/default/Vibrator.cpp
View File

@@ -50,18 +50,18 @@ Return<Status> 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) {

4
vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp
View File

@@ -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);
}

1
vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py
View File

@@ -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):