diff options
| author | Kenny Root <kroot@google.com> | 2014-10-31 10:28:04 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-03-17 21:27:05 +0000 |
| commit | 693ea60e9e3d2ef476e4f45caac234360d90bdb9 (patch) | |
| tree | 7b8791302b216d4e20af7dd00513e1d62c32c20d /tests | |
| parent | 842eee9f816a2e35bf3c9ce6c14cd5e43684265b (diff) | |
| download | frameworks_base-693ea60e9e3d2ef476e4f45caac234360d90bdb9.zip frameworks_base-693ea60e9e3d2ef476e4f45caac234360d90bdb9.tar.gz frameworks_base-693ea60e9e3d2ef476e4f45caac234360d90bdb9.tar.bz2 | |
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)
Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CoreTests/android/core/SSLSocketTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CoreTests/android/core/SSLSocketTest.java b/tests/CoreTests/android/core/SSLSocketTest.java index b06790b..65062c2 100644 --- a/tests/CoreTests/android/core/SSLSocketTest.java +++ b/tests/CoreTests/android/core/SSLSocketTest.java @@ -907,7 +907,7 @@ public class SSLSocketTest extends TestCase { */ public void testClientSessionCaching() throws IOException, KeyManagementException { - OpenSSLContextImpl context = new OpenSSLContextImpl(); + OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred(); // Cache size = 2. FakeClientSessionCache fakeCache = new FakeClientSessionCache(); @@ -1000,7 +1000,7 @@ public class SSLSocketTest extends TestCase { public void testFileBasedClientSessionCache() throws IOException, KeyManagementException { - OpenSSLContextImpl context = new OpenSSLContextImpl(); + OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred(); String tmpDir = System.getProperty("java.io.tmpdir"); if (tmpDir == null) { fail("Please set 'java.io.tmpdir' system property."); |