PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 70ce016f: am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.

Browse Source 
* commit '70ce016f84ce6c54b2c5f07adf86e415de5598cb':
  Allow VPN to stay connected for some time before disconnecting it.
This commit is contained in:
Xia Wang
2014-04-05 00:54:54 +00:00
committed by Android Git Automerger
parent 6068967fd9 70ce016f84
commit 52ddc781a1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/src/com/android/settings/vpn2/VpnTests.java
View File

@@ -89,6 +89,7 @@ public class VpnTests extends InstrumentationTestCase {
private static final String TAG = "VpnTests"; private static final String TAG = "VpnTests";
/* Maximum time to wait for VPN connection */ /* Maximum time to wait for VPN connection */
private static final long MAX_CONNECTION_TIME = 5 * 60 * 1000; private static final long MAX_CONNECTION_TIME = 5 * 60 * 1000;
private static final long VPN_STAY_TIME = 60 * 1000;
private static final int MAX_DISCONNECTION_TRIES = 3; private static final int MAX_DISCONNECTION_TRIES = 3;
private static final String EXTERNAL_SERVER = private static final String EXTERNAL_SERVER =
"http://ip2country.sourceforge.net/ip2c.php?format=JSON"; "http://ip2country.sourceforge.net/ip2c.php?format=JSON";
@@ -149,6 +150,12 @@ public class VpnTests extends InstrumentationTestCase {
mCertHelper = new CertInstallerHelper(); mCertHelper = new CertInstallerHelper();
} }
@Override
protected void tearDown() throws Exception {
sleep(VPN_STAY_TIME);
super.tearDown();
}
private void printVpnProfile(VpnProfile profile) { private void printVpnProfile(VpnProfile profile) {
Log.v(TAG, "profile: "); Log.v(TAG, "profile: ");
Log.v(TAG, "key: " + profile.key); Log.v(TAG, "key: " + profile.key);