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

Commit be34ad6c authored by Chris Phoenix's avatar Chris Phoenix Committed by android-build-merger
Browse files

Merge "wifi HAL uses "default" service name" am: 133aa77f 

am: 3b53cad8

Change-Id: I1f6212b6ed829971c1de42b9d2bdad9ed7bc539a
parents 3874fba6 3b53cad8

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;

}