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

Commit 06749652 authored by zhibo.chang's avatar zhibo.chang Committed by android-build-merger
Browse files

Merge "Fix the failed case for the... 

Merge "Fix the failed case for the VtsHalWifiSupplicantV1_2Host#SupplicantStaIfaceHidlTest.RegisterCallback_1_2" am: 528f91b0 am: 3a819999
am: b9868f99

Change-Id: I6f4faf1b515025ff096b1159dd69173c24e5e999
parents 3952872e b9868f99

wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void startHostapdAndWaitForHidlService() { 
    HostapdManager hostapd_manager;

    ASSERT_TRUE(hostapd_manager.StartHostapd());



    ASSERT_TRUE(notification_listener->waitForHidlService(200, service_name));

    ASSERT_TRUE(notification_listener->waitForHidlService(500, service_name));

}



bool is_1_1(const sp<IHostapd>& hostapd) {

wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void startSupplicantAndWaitForHidlService() { 
    ASSERT_TRUE(supplicant_manager.StartSupplicant());

    ASSERT_TRUE(supplicant_manager.IsSupplicantRunning());



    ASSERT_TRUE(notification_listener->waitForHidlService(200, service_name));

    ASSERT_TRUE(notification_listener->waitForHidlService(500, service_name));

}



bool is_1_1(const sp<ISupplicant>& supplicant) {