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

Commit 3985258a authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Deprecate SSLCertificateSocketFactory" am: f8615615 am: 68048199 

am: 37db9722

Change-Id: I8e716337b30fa802a5b07f8f16421ad3a499720e
parents 04780a12 37db9722

api/current.txt

+17 −17
Original line number Original line Diff line number Diff line
@@ -28912,24 +28912,24 @@ package android.net { 
    field public static final android.os.Parcelable.Creator<android.net.RouteInfo> CREATOR;

    field public static final android.os.Parcelable.Creator<android.net.RouteInfo> CREATOR;

  }

  }

















  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {







  @Deprecated public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {











    ctor @Deprecated public SSLCertificateSocketFactory(int);







    ctor @Deprecated public SSLCertificateSocketFactory(int);











    method public java.net.Socket createSocket(java.net.Socket, String, int, boolean) throws java.io.IOException;







    method @Deprecated public java.net.Socket createSocket(java.net.Socket, String, int, boolean) throws java.io.IOException;











    method public java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;







    method @Deprecated public java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;











    method public java.net.Socket createSocket(java.net.InetAddress, int) throws java.io.IOException;







    method @Deprecated public java.net.Socket createSocket(java.net.InetAddress, int) throws java.io.IOException;











    method public java.net.Socket createSocket(String, int, java.net.InetAddress, int) throws java.io.IOException;







    method @Deprecated public java.net.Socket createSocket(String, int, java.net.InetAddress, int) throws java.io.IOException;











    method public java.net.Socket createSocket(String, int) throws java.io.IOException;







    method @Deprecated public java.net.Socket createSocket(String, int) throws java.io.IOException;











    method public static javax.net.SocketFactory getDefault(int);







    method @Deprecated public static javax.net.SocketFactory getDefault(int);











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







    method @Deprecated public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache);











    method public String[] getDefaultCipherSuites();







    method @Deprecated public String[] getDefaultCipherSuites();











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







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











    method public byte[] getNpnSelectedProtocol(java.net.Socket);







    method @Deprecated public byte[] getNpnSelectedProtocol(java.net.Socket);











    method public String[] getSupportedCipherSuites();







    method @Deprecated public String[] getSupportedCipherSuites();











    method public void setHostname(java.net.Socket, String);







    method @Deprecated public void setHostname(java.net.Socket, String);











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







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











    method public void setNpnProtocols(byte[][]);







    method @Deprecated public void setNpnProtocols(byte[][]);











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







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











    method public void setUseSessionTickets(java.net.Socket, boolean);







    method @Deprecated public void setUseSessionTickets(java.net.Socket, boolean);











  }







  }



























  public final class SSLSessionCache {







  public final class SSLSessionCache {

























api/removed.txt



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -325,7 +325,7 @@ package android.net {









  @IntDef({0x0, 0xa, 0x14, 0x1e}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface NetworkBadging.Badging {







  @IntDef({0x0, 0xa, 0x14, 0x1e}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface NetworkBadging.Badging {











  }







  }































  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {







  @Deprecated public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {











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







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











  }







  }





















































core/java/android/net/SSLCertificateSocketFactory.java



+9
−0




























Original line number
Original line
Diff line number
Diff line








@@ -86,7 +86,16 @@ import javax.net.ssl.X509TrustManager;









 * <p>On development devices, "setprop socket.relaxsslcheck yes" bypasses all







 * <p>On development devices, "setprop socket.relaxsslcheck yes" bypasses all











 * SSL certificate and hostname checks for testing purposes.  This setting







 * SSL certificate and hostname checks for testing purposes.  This setting











 * requires root access.







 * requires root access.














 *














 * @deprecated This class has less error-prone replacements using standard APIs.  To create an














 * {@code SSLSocket}, obtain an {@link SSLSocketFactory} from {@link SSLSocketFactory#getDefault()}














 * or {@link javax.net.ssl.SSLContext#getSocketFactory()}.  To verify hostnames, pass














 * {@code "HTTPS"} to














 * {@link javax.net.ssl.SSLParameters#setEndpointIdentificationAlgorithm(String)}.  To enable ALPN,














 * use {@link javax.net.ssl.SSLParameters#setApplicationProtocols(String[])}.  To enable SNI,














 * use {@link javax.net.ssl.SSLParameters#setServerNames(java.util.List)}.











 */







 */














@Deprecated











public class SSLCertificateSocketFactory extends SSLSocketFactory {







public class SSLCertificateSocketFactory extends SSLSocketFactory {











    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)







    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)











    private static final String TAG = "SSLCertificateSocketFactory";







    private static final String TAG = "SSLCertificateSocketFactory";