Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7ab09ed authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "Fix build."

parents 7cdd26ce 536ff5a6

core/java/android/net/Proxy.java

+1 −6
Original line number Diff line number Diff line
@@ -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;

                }

            }