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

* commit 'e6cd9daff42dc512e7abfceaf6a38b60dbe3ef97':
  Download PAC when set after a diff PAC URL
This commit is contained in:
Jason Monk
2014-10-31 14:21:17 +00:00
committed by Android Git Automerger

View File

@@ -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() {