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

Commit 5e8a587d authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Tracking merge of dalvik-dev to master 

Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
parent aae05232

api/9.xml

+1 −1
Original line number Diff line number Diff line
@@ -268066,7 +268066,7 @@ 
</constructor>

</class>

<class name="UnrecoverableKeyException"

 extends="java.security.GeneralSecurityException"

 extends="java.security.UnrecoverableEntryException"

 abstract="false"

 static="false"

 final="false"

api/current.xml

+26 −26
Original line number Diff line number Diff line
@@ -234967,7 +234967,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="java.io.File">

<parameter name="newPath" type="java.io.File">

</parameter>

</method>

<method name="setExecutable"
@@ -238965,7 +238965,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="java.io.PipedInputStream">

<parameter name="target" type="java.io.PipedInputStream">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>
@@ -242177,9 +242177,9 @@ 
</parameter>

<parameter name="end" type="int">

</parameter>

<parameter name="dest" type="char[]">

<parameter name="dst" type="char[]">

</parameter>

<parameter name="destStart" type="int">

<parameter name="dstStart" type="int">

</parameter>

</method>

<method name="indexOf"
@@ -246604,7 +246604,7 @@ 
<method name="getName"

 return="java.lang.String"

 abstract="false"

 native="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"
@@ -250570,7 +250570,7 @@ 
 return="double"

 abstract="false"

 native="false"

 synchronized="false"

 synchronized="true"

 static="true"

 final="false"

 deprecated="not deprecated"
@@ -254070,7 +254070,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="string" type="java.lang.String">

<parameter name="toCopy" type="java.lang.String">

</parameter>

</constructor>

<constructor name="String"
@@ -256022,9 +256022,9 @@ 
</parameter>

<parameter name="srcPos" type="int">

</parameter>

<parameter name="dest" type="java.lang.Object">

<parameter name="dst" type="java.lang.Object">

</parameter>

<parameter name="destPos" type="int">

<parameter name="dstPos" type="int">

</parameter>

<parameter name="length" type="int">

</parameter>
@@ -256109,7 +256109,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="prop" type="java.lang.String">

<parameter name="propertyName" type="java.lang.String">

</parameter>

</method>

<method name="getProperty"
@@ -264697,7 +264697,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="chunklen" type="int">

<parameter name="chunkLength" type="int">

</parameter>

</method>

<method name="setFixedLengthStreamingMode"
@@ -271174,7 +271174,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="byte[]">

<parameter name="dst" type="byte[]">

</parameter>

</method>

<method name="get"
@@ -271187,7 +271187,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="byte[]">

<parameter name="dst" type="byte[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -271892,7 +271892,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="char[]">

<parameter name="dst" type="char[]">

</parameter>

</method>

<method name="get"
@@ -271905,7 +271905,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="char[]">

<parameter name="dst" type="char[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -272284,7 +272284,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="double[]">

<parameter name="dst" type="double[]">

</parameter>

</method>

<method name="get"
@@ -272297,7 +272297,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="double[]">

<parameter name="dst" type="double[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -272575,7 +272575,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="float[]">

<parameter name="dst" type="float[]">

</parameter>

</method>

<method name="get"
@@ -272588,7 +272588,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="float[]">

<parameter name="dst" type="float[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -272866,7 +272866,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="int[]">

<parameter name="dst" type="int[]">

</parameter>

</method>

<method name="get"
@@ -272879,7 +272879,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="int[]">

<parameter name="dst" type="int[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -273174,7 +273174,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="long[]">

<parameter name="dst" type="long[]">

</parameter>

</method>

<method name="get"
@@ -273187,7 +273187,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="long[]">

<parameter name="dst" type="long[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -273524,7 +273524,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="short[]">

<parameter name="dst" type="short[]">

</parameter>

</method>

<method name="get"
@@ -273537,7 +273537,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="short[]">

<parameter name="dst" type="short[]">

</parameter>

<parameter name="off" type="int">

</parameter>
@@ -284432,7 +284432,7 @@ 
</constructor>

</class>

<class name="UnrecoverableKeyException"

 extends="java.security.GeneralSecurityException"

 extends="java.security.UnrecoverableEntryException"

 abstract="false"

 static="false"

 final="false"

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[] {

core/tests/coretests/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ LOCAL_SRC_FILES := \ 


LOCAL_STATIC_JAVA_LIBRARIES += android-common



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_DX_FLAGS := --core-library

LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib

LOCAL_JAVA_LIBRARIES := android.test.runner android-common

LOCAL_PACKAGE_NAME := FrameworksCoreTests



LOCAL_CERTIFICATE := platform