diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-26 09:56:10 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-07-26 09:56:10 -0700 |
| commit | c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b (patch) | |
| tree | ce7dc533a62f0f7af9baebe02962ef098cbe351d | |
| parent | 7cdd26ce30e61a108e4def932b96aca9f031e5d2 (diff) | |
| parent | 536ff5a6d700a80dbd75adb737ec4b560fbed2dc (diff) | |
| download | frameworks_base-c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b.zip frameworks_base-c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b.tar.gz frameworks_base-c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b.tar.bz2 | |
Merge "Fix build."
| -rw-r--r-- | core/java/android/net/Proxy.java | 7 |
1 files changed, 1 insertions, 6 deletions
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 @@ final public class Proxy { 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 @@ final public class Proxy { if (host.equalsIgnoreCase("localhost")) { return true; } - if (InetAddress.getByAddress(NETIMPL.ipStringToByteArray(host)) - .isLoopbackAddress()) { + if (InetAddress.getByName(host).isLoopbackAddress()) { return true; } } |