Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ae427a authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage annotations" am: 792fb35c 

am: 8f2e5344

Change-Id: Ic37a31fc6bd855209003de26489a4c491dc80291
parents 7bc79296 8f2e5344

config/hiddenapi-light-greylist.txt

+0 −9
Original line number Diff line number Diff line
@@ -6240,15 +6240,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;-><init>()V

Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>(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;

core/java/org/apache/http/conn/ssl/AbstractVerifier.java

+2 −0
Original line number Diff line number Diff line
@@ -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" };

core/java/org/apache/http/conn/ssl/SSLSocketFactory.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {