drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracking merge of dalvik-dev to gingerbread

Browse Source 
git cherry-pick --no-commit 353ab63e412dd15029143de238e9590ab35eb583)
make update-api

Change-Id: I9e61616828a3a5745421350b9a2fc78ba181d388
This commit is contained in:
Brian Carlstrom
2010-08-19 12:24:22 -07:00
parent 42f90ca54f
commit 4d42ccd157
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/current.xml
View File

@ -246506,7 +246506,7 @@
<method name="copySign" <method name="copySign"
return="double" return="double"
abstract="false" abstract="false"
native="true" native="false"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@ -246521,7 +246521,7 @@
<method name="copySign" <method name="copySign"
return="float" return="float"
abstract="false" abstract="false"
native="true" native="false"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@ -264957,6 +264957,19 @@
<parameter name="p" type="java.security.Permission"> <parameter name="p" type="java.security.Permission">
</parameter> </parameter>
</method> </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>
<class name="SocketTimeoutException" <class name="SocketTimeoutException"
extends="java.io.InterruptedIOException" extends="java.io.InterruptedIOException"

2
core/tests/coretests/src/android/net/http/HttpsThroughHttpProxyTest.java
View File

@ -22,8 +22,8 @@ import java.io.Reader;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.net.ssl.TestSSLContext;
import junit.framework.TestCase; import junit.framework.TestCase;
import libcore.javax.net.ssl.TestSSLContext;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;