Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c7ab09ed: Merge "Fix build."

Browse Source 
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
This commit is contained in:
Jean-Baptiste Queru
2010-07-26 10:05:23 -07:00
committed by Android Git Automerger
parent 1b05a79f7d c7ab09ede5
commit 14d9c34ccb
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/Proxy.java
View File

@@ -16,8 +16,6 @@
package android.net; package android.net;
import org.apache.harmony.luni.platform.INetworkSystem;
import org.apache.harmony.luni.platform.Platform;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -44,8 +42,6 @@ final public class Proxy {
static final public String PROXY_CHANGE_ACTION = static final public String PROXY_CHANGE_ACTION =
"android.intent.action.PROXY_CHANGE"; "android.intent.action.PROXY_CHANGE";
static final private INetworkSystem NETIMPL = Platform.getNetworkSystem();
/** /**
* Return the proxy host set by the user. * Return the proxy host set by the user.
* @param ctx A Context used to get the settings for the proxy host. * @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")) { if (host.equalsIgnoreCase("localhost")) {
return true; return true;
} }
if (InetAddress.getByAddress(NETIMPL.ipStringToByteArray(host)) if (InetAddress.getByName(host).isLoopbackAddress()) {
.isLoopbackAddress()) {
return true; return true;
} }
} }