diff options
| author | Kenny Root <kroot@google.com> | 2014-11-03 18:50:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 18:50:21 +0000 |
| commit | affff329088e569158e0ee45ee0e580b3c285722 (patch) | |
| tree | aa9877e8f1d83b7edcacc470c8098b80495de83d /tests | |
| parent | f9de10252f96a136784de9d79cfcc1ab9e30d13f (diff) | |
| parent | d00ced983ee235f72a9261fd967309a2638dde05 (diff) | |
| download | frameworks_base-affff329088e569158e0ee45ee0e580b3c285722.zip frameworks_base-affff329088e569158e0ee45ee0e580b3c285722.tar.gz frameworks_base-affff329088e569158e0ee45ee0e580b3c285722.tar.bz2 | |
am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
Track change to Conscrypt
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."); |