am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'
* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
Tracking merge of dalvik-dev to gingerbread
diff --git a/api/current.xml b/api/current.xml
index 7c38aac..07ee68d0 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -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"
diff --git a/core/tests/coretests/src/android/net/http/HttpsThroughHttpProxyTest.java b/core/tests/coretests/src/android/net/http/HttpsThroughHttpProxyTest.java
index f3b7c06..95aad91 100644
--- a/core/tests/coretests/src/android/net/http/HttpsThroughHttpProxyTest.java
+++ b/core/tests/coretests/src/android/net/http/HttpsThroughHttpProxyTest.java
@@ -22,8 +22,8 @@
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;