From ab8166fa4e08d8f86504bb7311b86e31cd839cb1 Mon Sep 17 00:00:00 2001 From: Chris Phoenix Date: Wed, 18 Jan 2017 17:47:07 -0800 Subject: [PATCH] wifi 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 In support of b/33844934 Change-Id: Ia086509b3433976524bc4a0ac4b24385840ce565 --- wifi/1.0/default/service.cpp | 2 +- wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wifi/1.0/default/service.cpp b/wifi/1.0/default/service.cpp index 40e8b126c3..96d5c6f78e 100644 --- a/wifi/1.0/default/service.cpp +++ b/wifi/1.0/default/service.cpp @@ -34,7 +34,7 @@ int main(int /*argc*/, char** argv) { // Setup hwbinder service android::sp service = new android::hardware::wifi::V1_0::implementation::Wifi(); - CHECK_EQ(service->registerAsService("wifi"), android::NO_ERROR) + CHECK_EQ(service->registerAsService(), android::NO_ERROR) << "Failed to register wifi HAL"; joinRpcThreadpool(); diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp index f88b866819..050bba3fc7 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp @@ -34,8 +34,6 @@ using ::android::sp; using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; -const char kWifiServiceName[] = "wifi"; - void stopFramework() { ASSERT_EQ(std::system("svc wifi disable"), 0); sleep(5); @@ -44,7 +42,7 @@ void stopFramework() { void startFramework() { ASSERT_EQ(std::system("svc wifi enable"), 0); } sp getWifi() { - sp wifi = IWifi::getService(kWifiServiceName); + sp wifi = IWifi::getService(); return wifi; }