Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98' into gingerbread-plus-aosp

* commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98':
  Tracking merge of dalvik-dev to gingerbread
This commit is contained in:
Brian Carlstrom
2010-08-20 13:54:28 -07:00
committed by Android Git Automerger
parent 8b569c8d49 4d42ccd157
commit 005f0d084e
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

@@ -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"

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.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;