diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-11-25 18:52:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 18:52:03 +0000 |
| commit | 99f3b68146cafff32ddbc104baee8dbf5ab1c412 (patch) | |
| tree | 34a9fc212364f9291d47adc4d42925e00e306f3f /support/src | |
| parent | fc9c11995b07bbeea6712ce2e722646dabd238e4 (diff) | |
| parent | 06609270f635ac19a90bb01c480185b702882cf3 (diff) | |
| download | libcore-99f3b68146cafff32ddbc104baee8dbf5ab1c412.zip libcore-99f3b68146cafff32ddbc104baee8dbf5ab1c412.tar.gz libcore-99f3b68146cafff32ddbc104baee8dbf5ab1c412.tar.bz2 | |
am 06609270: Merge "Assert finite default timeout for TLS/SSL sessions."
* commit '06609270f635ac19a90bb01c480185b702882cf3':
Assert finite default timeout for TLS/SSL sessions.
Diffstat (limited to 'support/src')
| -rw-r--r-- | support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java index 8dd2085..8173e9d 100644 --- a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java +++ b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java @@ -53,7 +53,8 @@ public final class TestSSLContext extends Assert { private static final boolean IS_RI = StandardNames.IS_RI; public static final int EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 10; public static final int EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 100; - public static final int EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT = (IS_RI) ? 86400 : 0; + public static final int EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT = + (IS_RI) ? 24 * 3600 : 8 * 3600; /** * The Android SSLSocket and SSLServerSocket implementations are |