Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: Ib69dba9fbbb8f65859c9aa131b4b4ad36fbb2eb7

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}."