diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-11-21 14:42:37 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-01-21 14:00:20 -0800 |
| commit | 571815deb03bd0e3ed8497160e489c16c72d67a2 (patch) | |
| tree | 287ee6ae31171337f65785aa5a315207c6b68e96 | |
| parent | 0311cd2be856e4c5872ebbe5ac7e12eac334ad73 (diff) | |
| download | libcore-571815deb03bd0e3ed8497160e489c16c72d67a2.tar.gz | |
Assert finite default timeout for TLS/SSL sessions.
This makes CTS tests expect 8 hours as the default timeout for TLS/SSL
sessions. Prior to this change, sessions were expected to not time out
by default.
(cherry picked from commit 4e1404f2017dc7db05b69ecad241f78c5bb1a4ee)
Bug: 18369043
Bug: 18370076
Change-Id: I09ae9ee91df2fb4bb2e8cc812127dc9f05a14696
| -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 8dd2085cb99..8173e9d2fc4 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 |