Add Unsupported App Usage annotations to ConscryptEngineSocket.
Annotates the same methods as ConscryptFileDescriptorSocket to
reflect the change in implemetation of SSLSocket.
Bug: 161653721
Bug: 161800094
Test: m && flashall
Change-Id: I215ca8e49adf1d855e495d64f27765232770b32b
Merged-In: I215ca8e49adf1d855e495d64f27765232770b32b
(cherry picked from commit 8ebc95684c24078ff04643f0f656f80c3fa8e277)
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 adf5299..0eee041 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 @@
*
* @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 16f7581..d4ba3bf 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}."
