summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Klyubin2014-11-21 14:42:37 -0800
committerKenny Root2015-01-21 14:00:20 -0800
commit371ed8ed0dceb7c1bb61c53c92dfb5c15465833b (patch)
tree287ee6ae31171337f65785aa5a315207c6b68e96
parente9c9fe3ba63d86a8fed3dff1ade9185a43b1e53c (diff)
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.java3
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