resolved conflicts for merge of b3ffd4ad to master

Change-Id: I80b227b678ef168a45494acf879debed5861de39

1 files changed, 6 insertions, 6 deletions

diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java
index 830ff06..23a3ea8 100644
--- a/core/java/android/net/Proxy.java
+++ b/core/java/android/net/Proxy.java
@@ -299,15 +299,15 @@ public final 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)
         }