diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 04:02:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 04:02:01 +0000 |
| commit | 1f6e789b7ee9698ab8c528a393c28cce500ace04 (patch) | |
| tree | f94cdb76c346cb3db48f41945b4e3f5c8ba2dc5e /core/tests | |
| parent | 28d91bdbde63ba1afe3bb67c5466527ec7184217 (diff) | |
| parent | 12e752225aa96888358294be0d725d499a1c9f03 (diff) | |
| download | frameworks_base-1f6e789b7ee9698ab8c528a393c28cce500ace04.zip frameworks_base-1f6e789b7ee9698ab8c528a393c28cce500ace04.tar.gz frameworks_base-1f6e789b7ee9698ab8c528a393c28cce500ace04.tar.bz2 | |
Merge "Track change to JSSE provider"
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/Android.mk | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index b6b15c4..22fa7fc 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -23,7 +23,7 @@ LOCAL_SRC_FILES := \ LOCAL_DX_FLAGS := --core-library LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib mockwebserver guava littlemock -LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common +LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_CERTIFICATE := platform diff --git a/core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java b/core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java index 60c40db..04aa62a 100644 --- a/core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java +++ b/core/tests/coretests/src/android/net/http/X509TrustManagerExtensionsTest.java @@ -25,7 +25,7 @@ import javax.net.ssl.X509TrustManager; import junit.framework.TestCase; -import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl; +import com.android.org.conscrypt.TrustManagerImpl; public class X509TrustManagerExtensionsTest extends TestCase { |