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

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

Browse Source 
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
This commit is contained in:
Xia Wang
2012-01-11 17:53:38 -08:00
committed by Android Git Automerger
parent b18a7c3ef1 4ac4ab4ef0
commit 87badc20c7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
View File

@ -249,8 +249,6 @@ public class ConnectivityManagerTestActivity extends Activity {
sleep(SHORT_TIMEOUT); sleep(SHORT_TIMEOUT);
removeConfiguredNetworksAndDisableWifi(); removeConfiguredNetworksAndDisableWifi();
mWifiRegexs = mCM.getTetherableWifiRegexs(); 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 { public List<WifiConfiguration> loadNetworkConfigurations() throws Exception {