commit dc6b695bdb858f2af064697a3967ff448c81be2c
author The Android Automerger <android-build@google.com> Wed Aug 05 01:06:13 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Aug 05 01:06:13 2015 -0700
tree df979ca9291da84d5ca23fe4b214fd62c3005584
parent b1f11c0accdf0f1eae4a6eed19bc3f7f181aa60f
parent aefde538cb47270c4eec0e35cae6a575bab57981

merge in mnc-release history after reset to mnc-dev

src/com/android/managedprovisioning/task/AddWifiNetworkTask.java

diff --git a/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java b/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java
index 350d78f..9264f21 100644
--- a/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java
+++ b/src/com/android/managedprovisioning/task/AddWifiNetworkTask.java
@@ -41,7 +41,7 @@
     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;