diff options
| author | 2014-09-06 01:28:22 +0000 | |
|---|---|---|
| committer | 2014-09-06 01:28:23 +0000 | |
| commit | f7efe33da234c834dff0292dc6aceed26388ccfa (patch) | |
| tree | 983402e24566b7e96920f2f0dcd82920e4577885 | |
| parent | b75dd5cedd5eb83d1f9b86ad4a09a5e6ec3df537 (diff) | |
| parent | f5031e549472d1d813fa39b6b2973cd20c1b1120 (diff) | |
Merge "Increase long timeout to 2 minutes" into lmp-dev
| -rw-r--r-- | core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java index a3c5351c71e8..77e1c530f6e0 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java @@ -54,7 +54,7 @@ public class ConnectivityManagerTestBase extends InstrumentationTestCase { protected static final int WAIT_FOR_SCAN_RESULT = 10 * 1000; //10 seconds protected static final int WIFI_SCAN_TIMEOUT = 50 * 1000; // 50 seconds protected static final int SHORT_TIMEOUT = 5 * 1000; // 5 seconds - protected static final long LONG_TIMEOUT = 50 * 1000; // 50 seconds + protected static final long LONG_TIMEOUT = 2 * 60 * 1000; // 2 minutes protected static final long WIFI_CONNECTION_TIMEOUT = 5 * 60 * 1000; // 5 minutes // 2 minutes timer between wifi stop and start protected static final long WIFI_STOP_START_INTERVAL = 2 * 60 * 1000; // 2 minutes |