diff options
| author | Bob Lee <crazybob@google.com> | 2009-08-20 19:33:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-20 19:33:27 -0700 |
| commit | 6ab5f558f388e0feabccde40c67de1d425a7e5f7 (patch) | |
| tree | 1f6f5ad5e7b531b053106bcf159e868c04d90006 /x-net/src | |
| parent | 93e3ba1cac22c9f3bdd4507ce7fb62b851577ad7 (diff) | |
| parent | 8da7f0d2e2724e8e0f1b9ae1fedb92f3b0f075f6 (diff) | |
| download | libcore-6ab5f558f388e0feabccde40c67de1d425a7e5f7.zip libcore-6ab5f558f388e0feabccde40c67de1d425a7e5f7.tar.gz libcore-6ab5f558f388e0feabccde40c67de1d425a7e5f7.tar.bz2 | |
am 2b2e488b: Exposed default trust manager.
Merge commit '2b2e488b25922b0b34094305cac084073ffbd03c' into eclair
* commit '2b2e488b25922b0b34094305cac084073ffbd03c':
Exposed default trust manager.
Diffstat (limited to 'x-net/src')
| -rw-r--r-- | x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java b/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java index 60a5535..fb05722 100644 --- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java +++ b/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java @@ -431,5 +431,13 @@ public class SSLParameters implements Cloneable { } // END android-changed } -} + /** + * Gets the default trust manager. + * + * TODO: Move this to a published API under dalvik.system. + */ + public static X509TrustManager getDefaultTrustManager() { + return defaultTrustManager; + } +} |