| commit | b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <[email protected]> | Tue Oct 29 15:47:33 2013 +0000 |
| committer | Gerrit Code Review <[email protected]> | Tue Oct 29 15:47:34 2013 +0000 |
| tree | 43ea0be76e581d543a9776ac778b37b8cfa91d3e | |
| parent | a1b4d97b6920d3cd84fe19b07512a0de6996bb4c [diff] | |
| parent | 019118af67c60448030540deca37d972c8839d38 [diff] |
Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 208b212..b0278d3 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java
@@ -533,7 +533,7 @@ @Override public String[] getDefaultCipherSuites() { - return getDelegate().getSupportedCipherSuites(); + return getDelegate().getDefaultCipherSuites(); } @Override