Fix WifiInfoTest flakiness
Poll a bit longer waiting for getNetworkId and getWifiState to return
the proper values. The bug reports seem to indicate that the WiFi
is shutting down properly.
Add a new static check method to PollingCheck that I think is simpler
than the existing way of creating a new PollingCheck, overriding
check, and then making sure to call run. This new variation also allows
you to specify a message rather than just "unexpected timeout."
Bug 6443337
Change-Id: I9f7c942f6e26b957bb717b58b1ab984acc556bf7
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 3e48cd2..5c70ad4 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -28,7 +28,7 @@
LOCAL_PACKAGE_NAME := CtsNetTestCases
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctsutil
# uncomment when dalvik.annotation.Test* are removed or part of SDK
#LOCAL_SDK_VERSION := current