Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4acb7846 authored by Xia Wang's avatar Xia Wang Committed by Android Git Automerger
Browse files

am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR... 

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

* commit '87badc20':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
parents e328d6b0 87badc20

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

+0 −2
Original line number Diff line number Diff line
@@ -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 {