diff options
author | Chia-chi Yeh <chiachi@android.com> | 2011-07-22 15:46:52 -0700 |
---|---|---|
committer | Chia-chi Yeh <chiachi@android.com> | 2011-07-22 15:46:52 -0700 |
commit | 7ef8611b5f3a893a46c7b9e22bdd8ab252e373ff (patch) | |
tree | d9d42c3f290659694cdee61510ae752215ddf793 /services/java/com | |
parent | 556d0476e14803b406ddff7fe4c27baf1bf58334 (diff) | |
download | frameworks_base-7ef8611b5f3a893a46c7b9e22bdd8ab252e373ff.zip frameworks_base-7ef8611b5f3a893a46c7b9e22bdd8ab252e373ff.tar.gz frameworks_base-7ef8611b5f3a893a46c7b9e22bdd8ab252e373ff.tar.bz2 |
VPN: increase timeout period to 60 seconds for legacy VPN.
Some VPN needs more time than others in order to create the secure tunnel.
For example, L2TP/IPSec PSK on average needs 15 seconds on WiFi. On mobile
connection, variation gets larger, and it sometimes needs more than 30
seconds. This change increases timeout period from 30 to 60 seconds.
Change-Id: I6006fd254a7bc91c22f63d2f3f20ea79ee9b05e2
Diffstat (limited to 'services/java/com')
-rw-r--r-- | services/java/com/android/server/connectivity/Vpn.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index cf75d6b..9cb772e 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -396,7 +396,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub { if (mTimer == -1) { mTimer = now; Thread.sleep(1); - } else if (now - mTimer <= 30000) { + } else if (now - mTimer <= 60000) { Thread.sleep(yield ? 200 : 1); } else { mInfo.state = LegacyVpnInfo.STATE_TIMEOUT; |