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

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

Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev

parents 88cfb428 4bf1d218

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

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

        Intent intent = new Intent();

        intent.setClassName(PAC_PACKAGE, PAC_SERVICE);

        // Already bound no need to bind again.

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

            if (mLastPort != -1) {

                sendPacBroadcast(new ProxyInfo(mPacUrl, mLastPort));

            } else {

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

                        + " PAC will not be operational");

            }

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

            IoThread.getHandler().post(mPacDownloader);

            return;

        }

        mConnection = new ServiceConnection() {