am 87badc2: am 4ac4ab4: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1

Xia Wang · Android Git Automerger · commit 4acb784630c9 · 2012-01-11T17:57:16.000-08:00
* commit '87badc20c7d5462ee27f13adf50acaf6a3232884':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
@@ -249,8 +249,6 @@ protected void onCreate(Bundle savedInstanceState) {
         sleep(SHORT_TIMEOUT);
         removeConfiguredNetworksAndDisableWifi();
         mWifiRegexs = mCM.getTetherableWifiRegexs();
-        // after wifi is shutdown, wait for 2 minute to enable wifi
-        sleep(WIFI_STOP_START_INTERVAL);
      }
 
     public List<WifiConfiguration> loadNetworkConfigurations() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,6 @@ protected void onCreate(Bundle savedInstanceState) {`
`249`	`249`	`sleep(SHORT_TIMEOUT);`
`250`	`250`	`removeConfiguredNetworksAndDisableWifi();`
`251`	`251`	`mWifiRegexs = mCM.getTetherableWifiRegexs();`
`252`		`- // after wifi is shutdown, wait for 2 minute to enable wifi`
`253`		`- sleep(WIFI_STOP_START_INTERVAL);`
`254`	`252`	`}`
`255`	`253`
`256`	`254`	`public List<WifiConfiguration> loadNetworkConfigurations() throws Exception {`