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

Commit 4ae1e382 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread

parents 2c37f3d3 3c7c351a

Android.mk

+5 −24
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/com/android/internal/R.java



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core ext

LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext



LOCAL_MODULE := framework

LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -301,34 +301,14 @@ fwbase_dirs_to_document += core/config/sdk 
# Intentionally not included from libcore:

#     icu openssl suncompat support

libcore_to_document := \

	annotation/src/main/java/java \

	archive/src/main/java/java \

	auth/src/main/java/javax \

	awt-kernel/src/main/java/java \

	concurrent/src/main/java \

	crypto/src/main/java/javax \

	dalvik/src/main/java/dalvik \

	json/src/main/java \

	junit/src/main/java \

	logging/src/main/java/java \

	luni/src/main/java/java \

	luni-kernel/src/main/java/java \

	math/src/main/java/java \

	nio/src/main/java/java \

	nio_char/src/main/java/java \

	prefs/src/main/java/java \

	regex/src/main/java/java \

	security/src/main/java/java \

	security/src/main/java/javax \

	security-kernel/src/main/java/java \

	sql/src/main/java/java \

	sql/src/main/java/javax \

	text/src/main/java/java \

	x-net/src/main/java/javax \

	xml/src/main/java/javax \

	xml/src/main/java/org/xml/sax \

	luni/src/main/java/javax \

	luni/src/main/java/org/xml/sax \

	luni/src/main/java/org/w3c \

	xml/src/main/java/org/xmlpull/v1 \

	xml/src/main/java/org/w3c



non_base_dirs := \

	../../external/apache-http/src/org/apache/http
@@ -361,6 +341,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/com/android/internal/R.java



framework_docs_LOCAL_JAVA_LIBRARIES := \

			bouncycastle \

			core \

			ext \

			framework \

api/9.xml

+121 −1315

File changed.

Preview size limit exceeded, changes collapsed.

api/current.xml

+23514 −11220

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/net/SSLCertificateSocketFactory.java

+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ import javax.net.ssl.TrustManager; 
import javax.net.ssl.TrustManagerFactory;

import javax.net.ssl.X509TrustManager;



import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;

import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;

import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;

import org.apache.harmony.xnet.provider.jsse.SSLContextImpl;

import org.apache.harmony.xnet.provider.jsse.SSLParameters;



/**
@@ -210,7 +210,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 


    private SSLSocketFactory makeSocketFactory(TrustManager[] trustManagers) {

        try {

            SSLContextImpl sslContext = new SSLContextImpl();

            OpenSSLContextImpl sslContext = new OpenSSLContextImpl();

            sslContext.engineInit(null, trustManagers, null, mSessionCache, null);

            return sslContext.engineGetSocketFactory();

        } catch (KeyManagementException e) {

core/java/android/net/http/HttpsConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package android.net.http; 
import android.content.Context;

import android.util.Log;

import org.apache.harmony.xnet.provider.jsse.FileClientSessionCache;

import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;

import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;

import org.apache.harmony.xnet.provider.jsse.SSLContextImpl;

import org.apache.http.Header;

import org.apache.http.HttpException;

import org.apache.http.HttpHost;
@@ -79,7 +79,7 @@ public class HttpsConnection extends Connection { 
                cache = FileClientSessionCache.usingDirectory(sessionDir);

            }



            SSLContextImpl sslContext = new SSLContextImpl();

            OpenSSLContextImpl sslContext = new OpenSSLContextImpl();



            // here, trust managers is a single trust-all manager

            TrustManager[] trustManagers = new TrustManager[] {