Merge "wpa_supplicant HAL uses "default" service name"
am: f9fc2f08e0
Change-Id: Ib23501258a9bb5ae325546e69898092b133ba747
diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/hidl_manager.cpp
index b73cf97..2112cc9 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 a14cb5e..5d2ba8c 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.