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

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

Browse Source 
Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'

* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
  Tracking merge of dalvik-dev to gingerbread
This commit is contained in:
Brian Carlstrom
2010-08-24 09:03:29 -07:00
committed by Android Git Automerger
parent cc5239b78b 005f0d084e
commit 07d39e9150
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

@ -258066,7 +258066,7 @@
<method name="copySign"
return="double"
abstract="false"
native="true"
native="false"
synchronized="false"
static="true"
final="false"
@ -258081,7 +258081,7 @@
<method name="copySign"
return="float"
abstract="false"
native="true"
native="false"
synchronized="false"
static="true"
final="false"
@ -276517,6 +276517,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;