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

Commit e3227168 authored by Pete Bentley's avatar Pete Bentley Committed by Colin Cross
Browse files

Revert "Set setCurrentProxyScriptUrl as public" 

Revert submission 1532910-connectivity_jar_in_apex

Reason for revert: Breaks boot tests: b/176969905
Reverted Changes:
Ie41a5b569:Set setCurrentProxyScriptUrl as public
Id7b6a4664:Move service-connectivity to the tethering APEX
Ia7cb83834:Add service-connectivity to tethering APEX

Change-Id: I634242e3dbdab9f900b05410d5d208c5ae19ddb9
(cherry picked from commit 3a67cc18)
parent 72b28f26

services/core/java/com/android/server/connectivity/PacManager.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class PacManager { 
     * @param proxy Proxy information that is about to be broadcast.

     * @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_BROADCAST

     */

    public synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {

    synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {

        if (!Uri.EMPTY.equals(proxy.getPacFileUrl())) {

            if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {

                // Allow to send broadcast, nothing to do.