summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-10-29 18:40:33 +0900
committerRoshan Pius <rpius@google.com>2019-10-31 10:46:00 -0700
commitb8929d41279bffa218a665d383ba1a4e3afa570c (patch)
treee74f3448ff77495823685e7c9725debf8171c236
parent5a00530815780fd21d7b120bbd471fadf60f1117 (diff)
Extend the timeout to obtain IpClient
In some configurations (especially after a cold boot) it can take more than 10 seconds between the time WifiService starts, and NetworkStack starts. If the phone tries to connect to WiFi in that interval, it is possible that obtaining IpClient will timeout. Extend the timeout to one minute to make sure that even in a cold boot on a slow device, there is enough time for NetworkStack to start. Test: manual: phone boots, WiFi works Bug: 142842833 Change-Id: I757de74f54d4d35e67a9abac4746f77a56145fcf Merged-In: I757de74f54d4d35e67a9abac4746f77a56145fcf
-rw-r--r--service/java/com/android/server/wifi/ClientModeImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 134977a62..039f1d342 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -163,7 +163,7 @@ public class ClientModeImpl extends StateMachine {
private static final String EXTRA_UID = "uid";
private static final String EXTRA_PACKAGE_NAME = "PackageName";
private static final String EXTRA_PASSPOINT_CONFIGURATION = "PasspointConfiguration";
- private static final int IPCLIENT_TIMEOUT_MS = 10_000;
+ private static final int IPCLIENT_TIMEOUT_MS = 60_000;
private boolean mVerboseLoggingEnabled = false;
private final WifiPermissionsWrapper mWifiPermissionsWrapper;