Merge "wifi HAL uses "default" service name"
This commit is contained in:
commit
133aa77f8a
2 changed files with 2 additions and 4 deletions
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue