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

Commit 549d6140 authored by Kevin Hufnagle's avatar Kevin Hufnagle Committed by android-build-merger
Browse files

Merge "docs: Fix broken link to NPN protocol" am: cab84c8d am: 7c28465f 

am: d277bd6b

Change-Id: Iea050af8caa311e99c5a5536f7763167f7fc3efc
parents 4704618d d277bd6b

core/java/android/net/SSLCertificateSocketFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
    }



    /**

     * Sets the <a href="http://technotes.googlecode.com/git/nextprotoneg.html">Next

     * Sets the

     * <a class="external" href="https://tools.ietf.org/id/draft-agl-tls-nextprotoneg-03.html">Next

     * Protocol Negotiation (NPN)</a> protocols that this peer is interested in.

     *

     * <p>For servers this is the sequence of protocols to advertise as