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

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

am a031ae8c: am e6cd9daf: Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev 

* commit 'a031ae8c':
  Download PAC when set after a diff PAC URL
parents 6a7a24cc a031ae8c

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -265,14 +265,9 @@ public class PacManager { 
        }

        }

        Intent intent = new Intent();

        Intent intent = new Intent();

        intent.setClassName(PAC_PACKAGE, PAC_SERVICE);

        intent.setClassName(PAC_PACKAGE, PAC_SERVICE);

        // Already bound no need to bind again.

        if ((mProxyConnection != null) && (mConnection != null)) {

        if ((mProxyConnection != null) && (mConnection != null)) {

            if (mLastPort != -1) {

            // Already bound no need to bind again, just download the new file.

                sendPacBroadcast(new ProxyInfo(mPacUrl, mLastPort));

            IoThread.getHandler().post(mPacDownloader);

            } else {

                Log.e(TAG, "Received invalid port from Local Proxy,"

                        + " PAC will not be operational");

            }

            return;

            return;

        }

        }

        mConnection = new ServiceConnection() {

        mConnection = new ServiceConnection() {