drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

Browse Source 
* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
  Add extra 2 minute for wifi to shutdown
This commit is contained in:
Xia Wang
2011-12-05 15:55:27 -08:00
committed by Android Git Automerger
parent 96de4c3bef e63d67eff7
commit 96f660f4a8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,10 +63,12 @@ public class WifiStressTest
private final static long WIFI_IDLE_MS = 60 * 1000; private final static long WIFI_IDLE_MS = 60 * 1000;
/** /**
* The delay for Wi-Fi to get into idle, after screen off + WIFI_IDEL_MS + WIFI_IDLE_DELAY * Delay after issuing wifi shutdown.
* the Wi-Fi should be in idle mode and device should be in cellular mode. * The framework keep driver up for at leat 2 minutes to avoid problems
* that a quick shutdown could cause on wext driver and protentially
* on cfg based driver
*/ */
private final static long WIFI_IDLE_DELAY = 3 * 1000; private final static long WIFI_SHUTDOWN_DELAY = 2 * 60 * 1000;
private final static String OUTPUT_FILE = "WifiStressTestOutput.txt"; private final static String OUTPUT_FILE = "WifiStressTestOutput.txt";
private ConnectivityManagerTestActivity mAct; private ConnectivityManagerTestActivity mAct;
@ -265,7 +267,7 @@ public class WifiStressTest
PowerManager pm = PowerManager pm =
(PowerManager)mRunner.getContext().getSystemService(Context.POWER_SERVICE); (PowerManager)mRunner.getContext().getSystemService(Context.POWER_SERVICE);
assertFalse(pm.isScreenOn()); assertFalse(pm.isScreenOn());
sleep(WIFI_IDLE_MS, "Interruped while wait for wifi to be idle"); sleep(WIFI_IDLE_MS + WIFI_SHUTDOWN_DELAY, "Interruped while wait for wifi to be idle");
assertTrue("Wait for Wi-Fi to idle timeout", assertTrue("Wait for Wi-Fi to idle timeout",
mAct.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.DISCONNECTED, mAct.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.DISCONNECTED,
6 * ConnectivityManagerTestActivity.SHORT_TIMEOUT)); 6 * ConnectivityManagerTestActivity.SHORT_TIMEOUT));
@ -273,9 +275,9 @@ public class WifiStressTest
// use long timeout as the pppd startup may take several retries. // use long timeout as the pppd startup may take several retries.
assertTrue("Wait for cellular connection timeout", assertTrue("Wait for cellular connection timeout",
mAct.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED, mAct.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED,
ConnectivityManagerTestActivity.LONG_TIMEOUT)); 2 * ConnectivityManagerTestActivity.LONG_TIMEOUT));
} }
sleep(mWifiSleepTime + WIFI_IDLE_DELAY, "Interrupted while device is in sleep mode"); sleep(mWifiSleepTime, "Interrupted while device is in sleep mode");
// Verify the wi-fi is still off and data connection is on // Verify the wi-fi is still off and data connection is on
assertEquals("Wi-Fi is reconnected", State.DISCONNECTED, assertEquals("Wi-Fi is reconnected", State.DISCONNECTED,
mAct.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState()); mAct.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState());