commit 779efda7691b885ae072ea0ba9824dacc6e82338
author Kenny Root <kroot@google.com> Fri Jan 15 15:10:02 2016 -0800
committer Kenny Root <kroot@google.com> Mon Feb 01 02:55:34 2016 -0800
tree 51f9dfa87472f94231d4cf1b5830fb693e815c51
parent 542349a99542bfc9af1c6a0eb1ff1cc411c30792

Track libcore change

This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211
which adds honor-cipher-suite-ordering API.

Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 5268421..6969210 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -60240,6 +60240,7 @@
     method public java.lang.String[] getProtocols();
     method public final java.util.Collection<javax.net.ssl.SNIMatcher> getSNIMatchers();
     method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
+    method public final boolean getUseCipherSuitesOrder();
     method public boolean getWantClientAuth();
     method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
     method public void setCipherSuites(java.lang.String[]);
@@ -60248,6 +60249,7 @@
     method public void setProtocols(java.lang.String[]);
     method public final void setSNIMatchers(java.util.Collection<javax.net.ssl.SNIMatcher>);
     method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
+    method public final void setUseCipherSuitesOrder(boolean);
     method public void setWantClientAuth(boolean);
   }
 

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index b61ceb8..bf6d1a2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -62858,6 +62858,7 @@
     method public java.lang.String[] getProtocols();
     method public final java.util.Collection<javax.net.ssl.SNIMatcher> getSNIMatchers();
     method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
+    method public final boolean getUseCipherSuitesOrder();
     method public boolean getWantClientAuth();
     method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
     method public void setCipherSuites(java.lang.String[]);
@@ -62866,6 +62867,7 @@
     method public void setProtocols(java.lang.String[]);
     method public final void setSNIMatchers(java.util.Collection<javax.net.ssl.SNIMatcher>);
     method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
+    method public final void setUseCipherSuitesOrder(boolean);
     method public void setWantClientAuth(boolean);
   }