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

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

am cc4d2e0f: am b46eb904: am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev 

* commit 'cc4d2e0f':
  Fix error when PAC set rapidly
parents ccd0204e cc4d2e0f

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

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class PacManager { 
     */

    public synchronized boolean setCurrentProxyScriptUrl(ProxyProperties proxy) {

        if (!TextUtils.isEmpty(proxy.getPacFileUrl())) {

            if (proxy.getPacFileUrl().equals(mPacUrl)) {

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

                // Allow to send broadcast, nothing to do.

                return false;

            }