diff options
| author | Xia Wang <xiaw@google.com> | 2012-01-11 17:53:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-11 17:53:38 -0800 |
| commit | 87badc20c7d5462ee27f13adf50acaf6a3232884 (patch) | |
| tree | 37dddfedb87a69ecfb3160f06d8bc24ca47f1f1a | |
| parent | b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70 (diff) | |
| parent | 4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454 (diff) | |
| download | frameworks_base-87badc20c7d5462ee27f13adf50acaf6a3232884.zip frameworks_base-87badc20c7d5462ee27f13adf50acaf6a3232884.tar.gz frameworks_base-87badc20c7d5462ee27f13adf50acaf6a3232884.tar.bz2 | |
am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
| -rw-r--r-- | core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java index 0580ebc..d375d4c 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java @@ -249,8 +249,6 @@ public class ConnectivityManagerTestActivity extends Activity { 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 { |