drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"

Browse Source 
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp

* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
  Don't perform DNS lookup in android.net.Proxy.isLocalHost
This commit is contained in:
Brad Fitzpatrick
2010-10-10 11:49:43 -07:00
committed by Android Git Automerger
parent 5a41b3f8aa 3ed792d59c
commit b3ffd4adcc
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,9 +24,7 @@ import android.os.SystemProperties;
import android.provider.Settings;
import android.util.Log;
import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
import junit.framework.Assert;
@ -162,15 +160,15 @@ final public class Proxy {
final URI uri = URI.create(url);
final String host = uri.getHost();
if (host != null) {
if (host.equalsIgnoreCase("localhost")) {
return true;
}
if (InetAddress.getByName(host).isLoopbackAddress()) {
// TODO: InetAddress.isLoopbackAddress should be used to check
// for localhost. However no public factory methods exist which
// can be used without triggering DNS lookup if host is not localhost.
if (host.equalsIgnoreCase("localhost") ||
host.equals("127.0.0.1") ||
host.equals("[::1]")) {
return true;
}
}
} catch (UnknownHostException uex) {
// Ignore (INetworkSystem.ipStringToByteArray)
} catch (IllegalArgumentException iex) {
// Ignore (URI.create)
}