diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-24 01:13:39 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-24 01:13:39 +0000 |
| commit | 45660bd203ffc24bf365811761ed446b86118712 (patch) | |
| tree | 7a742a8d896866f19d64c24ba87b5e7ff7f40725 | |
| parent | 083b323093b82eb9ff4be442f96de5e8c2375579 (diff) | |
| parent | 96f2e5e16fc46cfaf8e46bac9ae9009dc119d73a (diff) | |
| download | conscrypt-android11-d1-s5-release.tar.gz | |
Snap for 6704881 from 96f2e5e16fc46cfaf8e46bac9ae9009dc119d73a to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: I619c87a444658b3ce3dd57b5abc0ff2965f88945
| -rw-r--r-- | repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java | 12 | ||||
| -rw-r--r-- | srcgen/unsupported-app-usage.json | 10 |
2 files changed, 20 insertions, 2 deletions
diff --git a/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java b/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java index adf52991..0eee0411 100644 --- a/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java +++ b/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java @@ -368,14 +368,22 @@ class ConscryptEngineSocket extends OpenSSLSocketImpl implements SSLParametersIm * * @param hostname the desired SNI hostname, or null to disable */ + @android.compat.annotation. + UnsupportedAppUsage(maxTargetSdk = dalvik.annotation.compat.VersionCodes.Q, + publicAlternatives = "Use {@link javax.net.ssl.SSLParameters#setServerNames}.") @Override - public final void setHostname(String hostname) { + public final void + setHostname(String hostname) { engine.setHostname(hostname); super.setHostname(hostname); } + @android.compat.annotation. + UnsupportedAppUsage(maxTargetSdk = dalvik.annotation.compat.VersionCodes.Q, + publicAlternatives = "Use {@link android.net.ssl.SSLSockets#setUseSessionTickets}.") @Override - public final void setUseSessionTickets(boolean useSessionTickets) { + public final void + setUseSessionTickets(boolean useSessionTickets) { engine.setUseSessionTickets(useSessionTickets); } diff --git a/srcgen/unsupported-app-usage.json b/srcgen/unsupported-app-usage.json index 16f75815..d4ba3bf1 100644 --- a/srcgen/unsupported-app-usage.json +++ b/srcgen/unsupported-app-usage.json @@ -73,6 +73,16 @@ "@location": "method:com.android.org.conscrypt.ClientSessionContext#setPersistentCache(SSLClientSessionCache)" }, { + "@location": "method:com.android.org.conscrypt.ConscryptEngineSocket#setHostname(String)", + "maxTargetSdk": "dalvik.annotation.compat.VersionCodes.Q", + "publicAlternatives": "Use {@link javax.net.ssl.SSLParameters#setServerNames}." + }, + { + "@location": "method:com.android.org.conscrypt.ConscryptEngineSocket#setUseSessionTickets(boolean)", + "maxTargetSdk": "dalvik.annotation.compat.VersionCodes.Q", + "publicAlternatives": "Use {@link android.net.ssl.SSLSockets#setUseSessionTickets}." + }, + { "@location": "method:com.android.org.conscrypt.ConscryptFileDescriptorSocket#setHostname(String)", "maxTargetSdk": "dalvik.annotation.compat.VersionCodes.Q", "publicAlternatives": "Use {@link javax.net.ssl.SSLParameters#setServerNames}." |