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

Commit 08208811 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove android.net.PskKeyManager"

parents d25cf29e 5e86d951

api/current.txt

+0 −13
Original line number Diff line number Diff line
@@ -23897,19 +23897,6 @@ package android.net { 
    field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;

  }













  public abstract class PskKeyManager {













    ctor public PskKeyManager();













    method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);













    method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);













    method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);













    method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);













    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);













    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);













    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100













  }



























  public final class RouteInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.net.IpPrefix getDestination();

























api/removed.txt



+7
−0




























Original line number
Diff line number
Diff line








@@ -167,6 +167,13 @@ package android.media.tv {





























package android.net {





























  public abstract class PskKeyManager {













    ctor public PskKeyManager();













    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100













  }





























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















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















  }

































api/system-current.txt



+0
−13




























Original line number
Diff line number
Diff line








@@ -25756,19 +25756,6 @@ package android.net {













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















  }



























  public abstract class PskKeyManager {













    ctor public PskKeyManager();













    method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);













    method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);













    method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);













    method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);













    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);













    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);













    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100













  }



























  public final class RouteInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.net.IpPrefix getDestination();

























api/system-removed.txt



+7
−0




























Original line number
Diff line number
Diff line








@@ -165,6 +165,13 @@ package android.media.tv {





























package android.net {





























  public abstract class PskKeyManager {













    ctor public PskKeyManager();













    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100













  }





























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















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















  }

































api/test-current.txt



+0
−13




























Original line number
Diff line number
Diff line








@@ -23970,19 +23970,6 @@ package android.net {













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















  }



























  public abstract class PskKeyManager {













    ctor public PskKeyManager();













    method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);













    method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);













    method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);













    method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);













    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);













    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);













    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80













    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100













  }



























  public final class RouteInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.net.IpPrefix getDestination();