diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 09:01:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 09:01:38 -0700 |
| commit | 178e8bbf25b6d211439133ec8525b7bab52f7796 (patch) | |
| tree | f5888c66301c9967870090085aa2ba2dd08dd12a /tests | |
| parent | 6a5a04ae66c4094164605b59cdc3a35a63c9a26e (diff) | |
| parent | e9ae6822a80cb1f3bd13c785f1727c03d35da52e (diff) | |
| download | frameworks_base-178e8bbf25b6d211439133ec8525b7bab52f7796.zip frameworks_base-178e8bbf25b6d211439133ec8525b7bab52f7796.tar.gz frameworks_base-178e8bbf25b6d211439133ec8525b7bab52f7796.tar.bz2 | |
am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
* commit 'e9ae6822a80cb1f3bd13c785f1727c03d35da52e':
Track change to JSSE provider
Diffstat (limited to 'tests')
| -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; |