supplicant(vts): Compilation fixes

Fixed couple of compilation failures from .hal changes and made change
to stop/start framework during tests.

Bug: 33457575
Test: mmma -j32 hardware/interfaces/wifi/supplicant/1.0/vts/functional
Change-Id: I1bac68bd71e92b025acdebd0fef8834b826bcfcb
This commit is contained in:
Roshan Pius
2017-03-21 15:44:40 -07:00
parent bf0f670580
commit e3509d455b
3 changed files with 13 additions and 4 deletions

View File

@@ -0,0 +1,2 @@
LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH))

View File

@@ -136,14 +136,14 @@ class ServiceNotificationListener : public IServiceNotification {
};
void stopWifiFramework() {
ASSERT_EQ(std::system("svc wifi disable"), 0);
ASSERT_EQ(std::system("stop"), 0);
// TODO: Use some other mechanism to wait for the framework to
// finish disabling.
sleep(5);
}
void startWifiFramework() {
ASSERT_EQ(std::system("svc wifi enable"), 0);
ASSERT_EQ(std::system("start"), 0);
// These tests don't care whether the framework
// finished enabling or not.
}

View File

@@ -104,11 +104,13 @@ class IfaceCallback : public ISupplicantStaIfaceCallback {
}
Return<void> onDisconnected(const hidl_array<uint8_t, 6>& /* bssid */,
bool /* locallyGenerated */,
uint32_t /* reasonCode */) override {
ISupplicantStaIfaceCallback::ReasonCode
/* reasonCode */) override {
return Void();
}
Return<void> onAssociationRejected(
const hidl_array<uint8_t, 6>& /* bssid */, uint32_t /* statusCode */,
const hidl_array<uint8_t, 6>& /* bssid */,
ISupplicantStaIfaceCallback::StatusCode /* statusCode */,
bool /*timedOut */) override {
return Void();
}
@@ -116,6 +118,11 @@ class IfaceCallback : public ISupplicantStaIfaceCallback {
const hidl_array<uint8_t, 6>& /* bssid */) override {
return Void();
}
Return<void> onBssidChanged(
ISupplicantStaIfaceCallback::BssidChangeReason /* reason */,
const hidl_array<uint8_t, 6>& /* bssid */) override {
return Void();
}
Return<void> onEapFailure() override { return Void(); }
Return<void> onWpsEventSuccess() override { return Void(); }
Return<void> onWpsEventFail(