summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2013-10-28 16:16:38 -0700
committerAlex Klyubin <klyubin@google.com>2013-10-28 16:24:33 -0700
commit019118af67c60448030540deca37d972c8839d38 (patch)
tree43ea0be76e581d543a9776ac778b37b8cfa91d3e
parenta1b4d97b6920d3cd84fe19b07512a0de6996bb4c (diff)
downloadframeworks_base-019118af67c60448030540deca37d972c8839d38.zip
frameworks_base-019118af67c60448030540deca37d972c8839d38.tar.gz
frameworks_base-019118af67c60448030540deca37d972c8839d38.tar.bz2
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
The method was returning all supported cipher suites instead of the default ones only. The default list of cipher suites actually used by sockets created by this factory is not affected by this issue. Change-Id: I2e4d7c6547fcb29ff7a0943bc8791706cc8d22bc
-rw-r--r--core/java/android/net/SSLCertificateSocketFactory.java2
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