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

Commit 0bf2dfbe authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87 am: aab03fb1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444f0f93b395be595e58b1766e4f94f1a046bf2d
parents 8c949901 aab03fb1

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

     */

    synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {

    public 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.