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/java/android/webkit | |
| 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/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/ClientCertRequestHandler.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index e627af1..7fe81dd 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -55,8 +55,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKey; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder; +import com.android.org.conscrypt.OpenSSLKey; +import com.android.org.conscrypt.OpenSSLKeyHolder; class BrowserFrame extends Handler { diff --git a/core/java/android/webkit/ClientCertRequestHandler.java b/core/java/android/webkit/ClientCertRequestHandler.java index f5a60f6..d7a6806 100644 --- a/core/java/android/webkit/ClientCertRequestHandler.java +++ b/core/java/android/webkit/ClientCertRequestHandler.java @@ -20,9 +20,9 @@ import android.os.Handler; import java.security.PrivateKey; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; -import org.apache.harmony.xnet.provider.jsse.NativeCrypto; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKey; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder; +import com.android.org.conscrypt.NativeCrypto; +import com.android.org.conscrypt.OpenSSLKey; +import com.android.org.conscrypt.OpenSSLKeyHolder; /** * ClientCertRequestHandler: class responsible for handling client |