commit b8e634f816873bfeef83861514890b3566665261
author Chris Phoenix <cphoenix@google.com> Fri Jan 20 23:32:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 23:32:45 2017 +0000
tree 943f6796f4d66439f3dffce0c0448be60a9a6033
parent 9f356278ae2d6f9d81ac2857690b99c4950a5055
parent be34ad6cb6c600f72dc400f9303181b1a73e2dbb

Merge "wifi HAL uses "default" service name" am: 133aa77f8a am: 3b53cad88c
am: be34ad6cb6

Change-Id: I5e05a82866705a09340f0f0633eb5f34669848b9

wifi/1.0/default/service.cpp

diff --git a/wifi/1.0/default/service.cpp b/wifi/1.0/default/service.cpp
index 40e8b12..96d5c6f 100644
--- a/wifi/1.0/default/service.cpp
+++ b/wifi/1.0/default/service.cpp
@@ -34,7 +34,7 @@
   // Setup hwbinder service
   android::sp<android::hardware::wifi::V1_0::IWifi> 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();

wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp

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 f88b866..050bba3 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::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 startFramework() { ASSERT_EQ(std::system("svc wifi enable"), 0); }
 
 sp<IWifi> getWifi() {
-    sp<IWifi> wifi = IWifi::getService(kWifiServiceName);
+    sp<IWifi> wifi = IWifi::getService();
     return wifi;
 }