Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 133aa77f authored by Chris Phoenix's avatar Chris Phoenix Committed by Gerrit Code Review
Browse files

Merge "wifi HAL uses "default" service name"

parents fa3cb176 ab8166fa

wifi/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int main(int /*argc*/, char** argv) { 
  // 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

+1 −3
Original line number Diff line number Diff line
@@ -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<IWifi> getWifi() {

    sp<IWifi> wifi = IWifi::getService(kWifiServiceName);

    sp<IWifi> wifi = IWifi::getService();

    return wifi;

}