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

Commit 005f0d08 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread 

Merge commit '4d42ccd1' into gingerbread-plus-aosp

* commit '4d42ccd1':
  Tracking merge of dalvik-dev to gingerbread
parents 8b569c8d 4d42ccd1

api/current.xml

+15 −2
Original line number Diff line number Diff line
@@ -246544,7 +246544,7 @@ 
<method name="copySign"

 return="double"

 abstract="false"

 native="true"

 native="false"

 synchronized="false"

 static="true"

 final="false"
@@ -246559,7 +246559,7 @@ 
<method name="copySign"

 return="float"

 abstract="false"

 native="true"

 native="false"

 synchronized="false"

 static="true"

 final="false"
@@ -264995,6 +264995,19 @@ 
<parameter name="p" type="java.security.Permission">

</parameter>

</method>

<method name="isValidIP6Address"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

</class>

<class name="SocketTimeoutException"

 extends="java.io.InterruptedIOException"

core/tests/coretests/src/android/net/http/HttpsThroughHttpProxyTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import java.io.Reader; 
import java.io.StringWriter;

import java.util.Arrays;

import java.util.List;

import javax.net.ssl.TestSSLContext;

import junit.framework.TestCase;

import libcore.javax.net.ssl.TestSSLContext;

import org.apache.http.HttpHost;

import org.apache.http.HttpResponse;

import org.apache.http.client.HttpClient;