diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-10-29 08:54:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 08:54:15 -0700 |
| commit | 07873e3a72da254bcdf965f6fa76bdcc800ef511 (patch) | |
| tree | a249f803ca9c8dd5cc1bb8c918b4c792fec0dc3c | |
| parent | 3a855ba5225ac6b3f85397713178a7b85069057a (diff) | |
| parent | 569220399841ae1a3fd62a1b77fa087bca2ee0f3 (diff) | |
| download | frameworks_base-07873e3a72da254bcdf965f6fa76bdcc800ef511.zip frameworks_base-07873e3a72da254bcdf965f6fa76bdcc800ef511.tar.gz frameworks_base-07873e3a72da254bcdf965f6fa76bdcc800ef511.tar.bz2 | |
am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit '569220399841ae1a3fd62a1b77fa087bca2ee0f3':
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
| -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 208b212..b0278d3 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 |