wpa_supplicant 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: I8548ef780c8f77a8c176c1d34a26ef2e850eb40b
diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/hidl_manager.cpp
index fae9e90..2a4d65c 100644
--- a/wpa_supplicant/hidl/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/hidl_manager.cpp
@@ -306,7 +306,6 @@
namespace V1_0 {
namespace implementation {
-const char HidlManager::kServiceName[] = "wpa_supplicant";
HidlManager *HidlManager::instance_ = NULL;
HidlManager *HidlManager::getInstance()
@@ -327,7 +326,7 @@
{
// Create the main hidl service object and register it.
supplicant_object_ = new Supplicant(global);
- if (supplicant_object_->registerAsService(kServiceName) !=
+ if (supplicant_object_->registerAsService() !=
android::NO_ERROR) {
return 1;
}
diff --git a/wpa_supplicant/hidl/hidl_manager.h b/wpa_supplicant/hidl/hidl_manager.h
index cbf086f..2e8dc5d 100644
--- a/wpa_supplicant/hidl/hidl_manager.h
+++ b/wpa_supplicant/hidl/hidl_manager.h
@@ -151,8 +151,6 @@
const std::function<android::hardware::Return<void>(
android::sp<ISupplicantStaNetworkCallback>)> &method);
- // HIDL Service name.
- static const char kServiceName[];
// Singleton instance of this class.
static HidlManager *instance_;
// The main hidl service object.