Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1775a0c8 authored by Ben Komalo's avatar Ben Komalo Committed by Android (Google) Code Review
Browse files

Merge "Open up setKeyManager/setTrustManager."

parents 04112075 193bc6d6

api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -11180,6 +11180,8 @@ package android.net { 
    method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

    method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

    method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache);

    method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache);

    method public java.lang.String[] getSupportedCipherSuites();

    method public java.lang.String[] getSupportedCipherSuites();

    method public void setKeyManagers(javax.net.ssl.KeyManager[]);

    method public void setTrustManagers(javax.net.ssl.TrustManager[]);

  }

  }

















  public final class SSLSessionCache {







  public final class SSLSessionCache {

























core/java/android/net/SSLCertificateSocketFactory.java



+0
−2




























Original line number
Original line
Diff line number
Diff line








@@ -240,7 +240,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {





























    /**







    /**











     * Sets the {@link TrustManager}s to be used for connections made by this factory.







     * Sets the {@link TrustManager}s to be used for connections made by this factory.











     * @hide














     */







     */











    public void setTrustManagers(TrustManager[] trustManager) {







    public void setTrustManagers(TrustManager[] trustManager) {











        mTrustManagers = trustManager;







        mTrustManagers = trustManager;









@@ -253,7 +252,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {





























    /**







    /**











     * Sets the {@link KeyManager}s to be used for connections made by this factory.







     * Sets the {@link KeyManager}s to be used for connections made by this factory.











     * @hide














     */







     */











    public void setKeyManagers(KeyManager[] keyManagers) {







    public void setKeyManagers(KeyManager[] keyManagers) {











        mKeyManagers = keyManagers;







        mKeyManagers = keyManagers;