From bbce9470925ef1111576c6717e890f6611620eb4 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Tue, 14 Aug 2018 19:04:16 +0100 Subject: [PATCH] Add @UnsupportedAppUsage annotations For packages: org.apache.http.params org.apache.http.conn.ssl org.apache.http.conn.scheme org.apache.http.conn This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Change-Id: Ia97cd8d932845e1f4c5454764efff206777d2e02 Merged-In: I4f19d319716b92da095b2b1d08f7c225f7ec027c --- config/hiddenapi-light-greylist.txt | 9 --------- core/java/org/apache/http/conn/ssl/AbstractVerifier.java | 2 ++ core/java/org/apache/http/conn/ssl/SSLSocketFactory.java | 9 +++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 531c0195307bb..685b0f21feca7 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -7949,15 +7949,6 @@ Llibcore/io/Memory;->pokeLong(JJZ)V Llibcore/io/Streams;->copy(Ljava/io/InputStream;Ljava/io/OutputStream;)I Llibcore/util/BasicLruCache;->map:Ljava/util/LinkedHashMap; Llibcore/util/ZoneInfo;->mTransitions:[J -Lorg/apache/http/conn/ssl/AbstractVerifier;->BAD_COUNTRY_2LDS:[Ljava/lang/String; -Lorg/apache/http/conn/ssl/SSLSocketFactory;->()V -Lorg/apache/http/conn/ssl/SSLSocketFactory;->(Ljavax/net/ssl/SSLSocketFactory;)V -Lorg/apache/http/conn/ssl/SSLSocketFactory;->createKeyManagers(Ljava/security/KeyStore;Ljava/lang/String;)[Ljavax/net/ssl/KeyManager; -Lorg/apache/http/conn/ssl/SSLSocketFactory;->createTrustManagers(Ljava/security/KeyStore;)[Ljavax/net/ssl/TrustManager; -Lorg/apache/http/conn/ssl/SSLSocketFactory;->hostnameVerifier:Lorg/apache/http/conn/ssl/X509HostnameVerifier; -Lorg/apache/http/conn/ssl/SSLSocketFactory;->nameResolver:Lorg/apache/http/conn/scheme/HostNameResolver; -Lorg/apache/http/conn/ssl/SSLSocketFactory;->socketfactory:Ljavax/net/ssl/SSLSocketFactory; -Lorg/apache/http/conn/ssl/SSLSocketFactory;->sslcontext:Ljavax/net/ssl/SSLContext; Lorg/ccil/cowan/tagsoup/AttributesImpl;->data:[Ljava/lang/String; Lorg/ccil/cowan/tagsoup/AttributesImpl;->length:I Lorg/ccil/cowan/tagsoup/ElementType;->theAtts:Lorg/ccil/cowan/tagsoup/AttributesImpl; diff --git a/core/java/org/apache/http/conn/ssl/AbstractVerifier.java b/core/java/org/apache/http/conn/ssl/AbstractVerifier.java index b9349b39ba94b..36d6e22ca8472 100644 --- a/core/java/org/apache/http/conn/ssl/AbstractVerifier.java +++ b/core/java/org/apache/http/conn/ssl/AbstractVerifier.java @@ -46,6 +46,7 @@ import java.util.Locale; import java.util.logging.Logger; import java.util.logging.Level; +import android.annotation.UnsupportedAppUsage; import javax.net.ssl.SSLException; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; @@ -76,6 +77,7 @@ public abstract class AbstractVerifier implements X509HostnameVerifier { * Looks like we're the only implementation guarding against this. * Firefox, Curl, Sun Java 1.4, 5, 6 don't bother with this check. */ + @UnsupportedAppUsage private final static String[] BAD_COUNTRY_2LDS = { "ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info", "lg", "ne", "net", "or", "org" }; diff --git a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java index 250932be0f365..65be161bc0f6c 100644 --- a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -36,6 +36,7 @@ import org.apache.http.conn.scheme.LayeredSocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; +import android.annotation.UnsupportedAppUsage; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; @@ -174,9 +175,13 @@ public class SSLSocketFactory implements LayeredSocketFactory { return NoPreloadHolder.DEFAULT_FACTORY; } + @UnsupportedAppUsage private final SSLContext sslcontext; + @UnsupportedAppUsage private final javax.net.ssl.SSLSocketFactory socketfactory; + @UnsupportedAppUsage private final HostNameResolver nameResolver; + @UnsupportedAppUsage private X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; public SSLSocketFactory( @@ -233,6 +238,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { * * @hide */ + @UnsupportedAppUsage public SSLSocketFactory(javax.net.ssl.SSLSocketFactory socketfactory) { super(); this.sslcontext = null; @@ -245,6 +251,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { * This constructor is used exclusively to instantiate the factory for * {@link #getSocketFactory getSocketFactory}. */ + @UnsupportedAppUsage private SSLSocketFactory() { super(); this.sslcontext = null; @@ -252,6 +259,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { this.nameResolver = null; } + @UnsupportedAppUsage private static KeyManager[] createKeyManagers(final KeyStore keystore, final String password) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException { if (keystore == null) { @@ -263,6 +271,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { return kmfactory.getKeyManagers(); } + @UnsupportedAppUsage private static TrustManager[] createTrustManagers(final KeyStore keystore) throws KeyStoreException, NoSuchAlgorithmException { if (keystore == null) {