Merge "supplicant(vts): Compilation fixes" into oc-dev (8896e2f5) · Commits · e / os / android_hardware_interfaces

wifi/supplicant/1.0/vts/Android.mk

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)
		include $(call all-makefiles-under,$(LOCAL_PATH))

+2 −2

Original line number	Diff line number	Diff line
		@@ -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.
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -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(