Merge "Fix WiFi stress test" into jb-mr1-dev (c86e8dff) · Commits · e / os / android_frameworks_base

core/tests/ConnectivityManagerTest/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,4 +74,5 @@
		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
		<uses-permission android:name="android.permission.INJECT_EVENTS" />
		</manifest>

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java

+24 −23

Original line number	Diff line number	Diff line
		@@ -65,6 +65,8 @@ public class ConnectivityManagerTestActivity extends Activity {
		public static final long LONG_TIMEOUT = 50 * 1000;
		// 2 minutes timer between wifi stop and start
		public static final long WIFI_STOP_START_INTERVAL = 2 * 60 * 1000;
		// Set ping test timer to be 3 minutes
		public static final long PING_TIMER = 3 * 60 *1000;
		public static final int SUCCESS = 0; // for Wifi tethering state change
		public static final int FAILURE = 1;
		public static final int INIT = -1;
		@@ -517,12 +519,14 @@ public class ConnectivityManagerTestActivity extends Activity {
		* @return true if the ping test is successful, false otherwise.
		*/
		public boolean pingTest(String[] pingServerList) {
		boolean result = false;
		String[] hostList = {"www.google.com", "www.yahoo.com",
		"www.bing.com", "www.facebook.com", "www.ask.com"};
		if (pingServerList != null) {
		hostList = pingServerList;
		}

		long startTime = System.currentTimeMillis();
		while ((System.currentTimeMillis() - startTime) < PING_TIMER) {
		try {
		// assume the chance that all servers are down is very small
		for (int i = 0; i < hostList.length; i++ ) {
		@@ -532,11 +536,7 @@ public class ConnectivityManagerTestActivity extends Activity {
		int status = p.waitFor();
		if (status == 0) {
		// if any of the ping test is successful, return true
		result = true;
		break;
		} else {
		result = false;
		log("ping " + host + " failed.");
		return true;
		}
		}
		} catch (UnknownHostException e) {
		@@ -546,8 +546,9 @@ public class ConnectivityManagerTestActivity extends Activity {
		} catch (InterruptedException e) {
		log("Ping test Fail: InterruptedException");
		}
		log("return");
		return result;
		}
		// ping test timeout
		return false;
		}

		/**

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.net.wifi.WifiManager;
		import android.os.Environment;
		import android.os.PowerManager;
		import android.provider.Settings;
		import android.view.KeyEvent;
		import android.test.ActivityInstrumentationTestCase2;
		import android.test.suitebuilder.annotation.LargeTest;
		import android.util.Log;
		@@ -289,6 +290,11 @@ public class WifiStressTest

		// Turn screen on again
		mAct.turnScreenOn();
		// Wait for 2 seconds for the lock screen
		sleep(2 * 1000, "wait 2 seconds for lock screen");
		// Disable lock screen by inject menu key event
		mRunner.sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);

		// Measure the time for Wi-Fi to get connected
		long startTime = System.currentTimeMillis();
		assertTrue("Wait for Wi-Fi enable timeout after wake up",