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 /core/tests | |
| 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 '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 { |