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

memtrack HAL uses "default" service name

Browse Source 
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: Ide36b5470a393b5ed0f60fd37661dd50d0db817b
This commit is contained in:
Chris Phoenix
2017-01-23 13:59:13 -08:00
parent aadf1586a3
commit 5985dedba2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
memtrack/1.0/default/Memtrack.cpp
View File

@@ -73,19 +73,19 @@ Return<void> Memtrack::getMemory(int32_t pid, MemtrackType type,
}
IMemtrack* HIDL_FETCH_IMemtrack(const char* name) {
IMemtrack* HIDL_FETCH_IMemtrack(const char* /* name */) {
const hw_module_t* hw_module = nullptr;
const memtrack_module_t* memtrack_module = nullptr;
int err = hw_get_module(name, &hw_module);
int err = hw_get_module(MEMTRACK_HARDWARE_MODULE_ID, &hw_module);
if (err) {
ALOGE ("hw_get_module %s failed: %d", name, err);
ALOGE ("hw_get_module %s failed: %d", MEMTRACK_HARDWARE_MODULE_ID, err);
return nullptr;
}
if (!hw_module->methods || !hw_module->methods->open) {
memtrack_module = reinterpret_cast<const memtrack_module_t*>(hw_module);
} else {
err = hw_module->methods->open(hw_module, name,
err = hw_module->methods->open(hw_module, MEMTRACK_HARDWARE_MODULE_ID,
reinterpret_cast<hw_device_t**>(const_cast<memtrack_module_t**>(&memtrack_module)));
if (err) {
ALOGE("Passthrough failed to load legacy HAL.");

2
memtrack/1.0/default/service.cpp
View File

@@ -23,5 +23,5 @@ using android::hardware::memtrack::V1_0::IMemtrack;
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
return defaultPassthroughServiceImplementation<IMemtrack>("memtrack");
return defaultPassthroughServiceImplementation<IMemtrack>();
}

2
memtrack/1.0/vts/functional/memtrack_hidl_hal_test.cpp
View File

@@ -37,7 +37,7 @@ using std::count_if;
class MemtrackHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
memtrack = IMemtrack::getService("memtrack");
memtrack = IMemtrack::getService();
ASSERT_NE(memtrack, nullptr);
}