diff options
| author | Kenny Root <kroot@google.com> | 2013-04-23 22:34:24 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 15:15:27 -0700 |
| commit | 12e752225aa96888358294be0d725d499a1c9f03 (patch) | |
| tree | d716c7eedc50ccdf146aaca9b55fae969cf753ec /tests/CoreTests | |
| parent | 28b1f0ee02e14241ffb81f431fc54053771c1c90 (diff) | |
| download | frameworks_base-12e752225aa96888358294be0d725d499a1c9f03.zip frameworks_base-12e752225aa96888358294be0d725d499a1c9f03.tar.gz frameworks_base-12e752225aa96888358294be0d725d499a1c9f03.tar.bz2 | |
Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
Diffstat (limited to 'tests/CoreTests')
| -rw-r--r-- | tests/CoreTests/android/Android.mk | 2 | ||||
| -rw-r--r-- | tests/CoreTests/android/core/SSLSocketTest.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk index 5abfc88..bc0e4e4 100644 --- a/tests/CoreTests/android/Android.mk +++ b/tests/CoreTests/android/Android.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := \ $(call all-subdir-java-files) -LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle +LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt LOCAL_PACKAGE_NAME := CoreTests diff --git a/tests/CoreTests/android/core/SSLSocketTest.java b/tests/CoreTests/android/core/SSLSocketTest.java index 03905e1..b06790b 100644 --- a/tests/CoreTests/android/core/SSLSocketTest.java +++ b/tests/CoreTests/android/core/SSLSocketTest.java @@ -18,10 +18,10 @@ package android.core; import junit.framework.TestCase; +import com.android.org.conscrypt.FileClientSessionCache; +import com.android.org.conscrypt.OpenSSLContextImpl; +import com.android.org.conscrypt.SSLClientSessionCache; import org.apache.commons.codec.binary.Base64; -import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache; -import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl; -import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache; import java.io.ByteArrayInputStream; import java.io.DataInputStream; |