diff options
| author | Kenny Root <kroot@google.com> | 2013-04-29 23:09:03 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 23:09:03 -0700 |
| commit | e9ae6822a80cb1f3bd13c785f1727c03d35da52e (patch) | |
| tree | b1458872d38a68b06c277276a3062bac0247509d /tests | |
| parent | be53f1806cf9f0ec69f785a0063227e0ed795eb8 (diff) | |
| parent | 1f6e789b7ee9698ab8c528a393c28cce500ace04 (diff) | |
| download | frameworks_base-e9ae6822a80cb1f3bd13c785f1727c03d35da52e.zip frameworks_base-e9ae6822a80cb1f3bd13c785f1727c03d35da52e.tar.gz frameworks_base-e9ae6822a80cb1f3bd13c785f1727c03d35da52e.tar.bz2 | |
resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
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; |