commit 14d9c34ccb75795d0b219b3dcc42c2269eb0e756
author Jean-Baptiste Queru <jbq@google.com> Mon Jul 26 10:05:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 26 10:05:23 2010 -0700
tree 43634b475260f7f7ba3f89d99d3f87b9d5ba75c7
parent 1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae
parent c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b

am c7ab09ed: Merge "Fix build."

Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.

core/java/android/net/Proxy.java

diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java
index 39d4ac1..22c30a5 100644
--- a/core/java/android/net/Proxy.java
+++ b/core/java/android/net/Proxy.java
@@ -16,8 +16,6 @@
 
 package android.net;
 
-import org.apache.harmony.luni.platform.INetworkSystem;
-import org.apache.harmony.luni.platform.Platform;
 import org.apache.http.HttpHost;
 
 import android.content.ContentResolver;
@@ -44,8 +42,6 @@
     static final public String PROXY_CHANGE_ACTION =
         "android.intent.action.PROXY_CHANGE";
 
-    static final private INetworkSystem NETIMPL = Platform.getNetworkSystem();
-
     /**
      * Return the proxy host set by the user.
      * @param ctx A Context used to get the settings for the proxy host.
@@ -169,8 +165,7 @@
                 if (host.equalsIgnoreCase("localhost")) {
                     return true;
                 }
-                if (InetAddress.getByAddress(NETIMPL.ipStringToByteArray(host))
-                        .isLoopbackAddress()) {
+                if (InetAddress.getByName(host).isLoopbackAddress()) {
                     return true;
                 }
             }