diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-16 20:57:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 20:57:58 +0000 |
| commit | c51b9a446b24dedea02f32adfa44222a139fd6bc (patch) | |
| tree | 0065bfcfc8fcd2f5e493d46978da3a16cafb6aad /luni/src/main/java/javax | |
| parent | 5a344c025aeadfd9d59c8e6f9cd07dae91bd1f6a (diff) | |
| parent | e8a958066d95a4e15a9834e8b9067d106efd9b53 (diff) | |
| download | libcore-c51b9a446b24dedea02f32adfa44222a139fd6bc.zip libcore-c51b9a446b24dedea02f32adfa44222a139fd6bc.tar.gz libcore-c51b9a446b24dedea02f32adfa44222a139fd6bc.tar.bz2 | |
am e8a95806: @hide.
* commit 'e8a958066d95a4e15a9834e8b9067d106efd9b53':
@hide.
Diffstat (limited to 'luni/src/main/java/javax')
4 files changed, 5 insertions, 0 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java index b55acd4..d938642 100644 --- a/luni/src/main/java/javax/net/ssl/SSLEngine.java +++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java @@ -783,6 +783,7 @@ public abstract class SSLEngine { * * @return the SSL session for this engine instance. * @since 1.7 + * @hide 1.7 */ public SSLSession getHandshakeSession() { throw new UnsupportedOperationException(); diff --git a/luni/src/main/java/javax/net/ssl/SSLParameters.java b/luni/src/main/java/javax/net/ssl/SSLParameters.java index 93e766f..d049038 100644 --- a/luni/src/main/java/javax/net/ssl/SSLParameters.java +++ b/luni/src/main/java/javax/net/ssl/SSLParameters.java @@ -146,6 +146,7 @@ public class SSLParameters { * * @see #setEndpointIdentificationAlgorithm(String) * @since 1.7 + * @hide 1.7 */ public String getEndpointIdentificationAlgorithm() { return endpointIdentificationAlgorithm; @@ -157,6 +158,7 @@ public class SSLParameters { * * @see #getEndpointIdentificationAlgorithm() * @since 1.7 + * @hide 1.7 */ public void setEndpointIdentificationAlgorithm(String endpointIdentificationAlgorithm) { this.endpointIdentificationAlgorithm = endpointIdentificationAlgorithm; diff --git a/luni/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java index 148f3cf..dd89e90 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocket.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java @@ -895,6 +895,7 @@ public abstract class SSLSocket extends Socket { * * @return the session object. * @since 1.7 + * @hide 1.7 */ public SSLSession getHandshakeSession() { throw new UnsupportedOperationException(); diff --git a/luni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java b/luni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java index 2af1c11..61ab169 100644 --- a/luni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java +++ b/luni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java @@ -27,6 +27,7 @@ import java.security.cert.X509Certificate; * * @see SSLParameters#setEndpointIdentificationAlgorithm(String) * @since 1.7 + * @hide 1.7 */ public abstract class X509ExtendedTrustManager implements X509TrustManager { /** |