summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJukka Zitting <jlz@google.com>2015-08-04 19:05:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-04 19:05:21 +0000
commitabe7192f561e66c0161c4f80af0b1cb297e06f8e (patch)
treedf979ca9291da84d5ca23fe4b214fd62c3005584
parent74afa0d17e1dd739ab8b4aca738b9fd4381c96cb (diff)
parentb1f11c0accdf0f1eae4a6eed19bc3f7f181aa60f (diff)
downloadandroid_packages_apps_ManagedProvisioning-abe7192f561e66c0161c4f80af0b1cb297e06f8e.tar.gz
android_packages_apps_ManagedProvisioning-abe7192f561e66c0161c4f80af0b1cb297e06f8e.tar.bz2
android_packages_apps_ManagedProvisioning-abe7192f561e66c0161c4f80af0b1cb297e06f8e.zip
am b1f11c0a: Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" into mnc-dev
* commit 'b1f11c0accdf0f1eae4a6eed19bc3f7f181aa60f': Increase Wi-Fi connection timeout from 30 to 60 seconds
-rw-r--r--src/com/android/managedprovisioning/task/AddWifiNetworkTask.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java b/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java
index 350d78f9..9264f219 100644
--- a/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java
+++ b/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java
@@ -41,7 +41,7 @@ public class AddWifiNetworkTask implements NetworkMonitor.Callback {
private static final int RETRY_SLEEP_DURATION_BASE_MS = 500;
private static final int RETRY_SLEEP_MULTIPLIER = 2;
private static final int MAX_RETRIES = 6;
- private static final int RECONNECT_TIMEOUT_MS = 30000;
+ private static final int RECONNECT_TIMEOUT_MS = 60000;
private final Context mContext;
private final WifiInfo mWifiInfo;