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

Commit bb69bde5 authored by Tsu Chiang Chuang's avatar Tsu Chiang Chuang Committed by Android Git Automerger
Browse files

am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 

* commit '3e701270':
  extend timeout to allow for more time for the device to connect.
parents d70eaff4 3e701270

core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java

+8 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class ConnectionUtil { 
    private static final int WAIT_FOR_SCAN_RESULT = 10 * 1000; // 10 seconds

    private static final int WIFI_SCAN_TIMEOUT = 50 * 1000;

    public static final int SHORT_TIMEOUT = 5 * 1000;

    public static final int LONG_TIMEOUT = 120 * 1000; // 2 minutes

    public static final int LONG_TIMEOUT = 5 * 60 * 1000; // 5 minutes

    private ConnectivityReceiver mConnectivityReceiver = null;

    private WifiReceiver mWifiReceiver = null;

    private DownloadReceiver mDownloadReceiver = null;
@@ -458,7 +458,13 @@ public class ConnectionUtil { 
                if (mNetworkInfo == null) {

                    Log.v(LOG_TAG, "Do not have networkInfo! Force fetch of network info.");

                    mNetworkInfo = mCM.getActiveNetworkInfo();

                    Assert.assertNotNull(mNetworkInfo);

                }

                // Still null after force fetch? Maybe the network did not have time to be brought

                // up yet.

                if (mNetworkInfo == null) {

                    Log.v(LOG_TAG, "Failed to force fetch networkInfo. " +

                            "The network is still not ready. Wait for the next broadcast");

                    continue;

                }

                if ((mNetworkInfo.getType() != networkType) ||

                        (mNetworkInfo.getState() != expectedState)) {