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

Commit 7c053a2f authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved addr" into klp-dev 

* commit 'cb134203':
  Change PacProxySelector to return unresolved addr
parents 9916eb6e cb134203

core/java/android/net/PacProxySelector.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class PacProxySelector extends ProxySelector { 
                } catch (Exception e) {

                    port = 8080;

                }

                ret.add(new Proxy(Type.HTTP, new InetSocketAddress(host, port)));

                ret.add(new Proxy(Type.HTTP, InetSocketAddress.createUnresolved(host, port)));

            }

        }

        if (ret.size() == 0) {

packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ public class ProxyServer extends Thread { 
                        if (!proxy.equals(Proxy.NO_PROXY)) {

                            // Only Inets created by PacProxySelector.

                            InetSocketAddress inetSocketAddress =

                                    (InetSocketAddress)list.get(0).address();

                            server = new Socket(inetSocketAddress.getAddress(),

                                    (InetSocketAddress)proxy.address();

                            server = new Socket(inetSocketAddress.getHostName(),

                                    inetSocketAddress.getPort());

                            sendLine(server, requestLine);

                        } else {