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

Commit c241db85 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix badness from proxy refactoring."

parents 2509be2b 5df281a5

core/java/android/net/Proxy.java

+3 −1
Original line number Diff line number Diff line
@@ -278,8 +278,10 @@ public final class Proxy { 
            host = p.getHost();

            port = Integer.toString(p.getPort());

            exclList = p.getExclusionListAsString();

            if (p.getPacFileUrl() != null) {

                pacFileUrl = p.getPacFileUrl().toString();

            }

        }

        setHttpProxySystemProperty(host, port, exclList, pacFileUrl);

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -1327,13 +1327,15 @@ public final class ActivityManagerService extends ActivityManagerNative 
                String host = "";

                String port = "";

                String exclList = "";

                String pacFileUrl = null;

                String pacFileUrl = "";

                if (proxy != null) {

                    host = proxy.getHost();

                    port = Integer.toString(proxy.getPort());

                    exclList = proxy.getExclusionListAsString();

                    if (proxy.getPacFileUrl() != null) {

                        pacFileUrl = proxy.getPacFileUrl().toString();

                    }

                }

                synchronized (ActivityManagerService.this) {

                    for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) {

                        ProcessRecord r = mLruProcesses.get(i);