From 4d42ccd1579da53aaaf132a6ad26a06e2baa5b98 Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Thu, 19 Aug 2010 12:24:22 -0700
Subject: [PATCH] Tracking merge of dalvik-dev to gingerbread

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

Change-Id: I9e61616828a3a5745421350b9a2fc78ba181d388
---
 api/current.xml                                 | 17 +++++++++++++++--
 .../net/http/HttpsThroughHttpProxyTest.java     |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 06e9bfd0b7d60..e7b0e3b3a9ec8 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -246506,7 +246506,7 @@
 <method name="copySign"
  return="double"
  abstract="false"
- native="true"
+ native="false"
  synchronized="false"
  static="true"
  final="false"
@@ -246521,7 +246521,7 @@
 <method name="copySign"
  return="float"
  abstract="false"
- native="true"
+ native="false"
  synchronized="false"
  static="true"
  final="false"
@@ -264957,6 +264957,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 f3b7c06a853b0..95aad91a6f102 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.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;