diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-10-29 15:47:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-29 15:47:34 +0000 |
| commit | b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48 (patch) | |
| tree | 43ea0be76e581d543a9776ac778b37b8cfa91d3e /core/java/android | |
| parent | a1b4d97b6920d3cd84fe19b07512a0de6996bb4c (diff) | |
| parent | 019118af67c60448030540deca37d972c8839d38 (diff) | |
Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 208b2126e14d..b0278d39e072 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -533,7 +533,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { @Override public String[] getDefaultCipherSuites() { - return getDelegate().getSupportedCipherSuites(); + return getDelegate().getDefaultCipherSuites(); } @Override |