Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a031ae8c825e154838f599fb072bba021e047f73':
  Download PAC when set after a diff PAC URL
This commit is contained in:
Jason Monk
2014-10-31 14:24:44 +00:00
committed by Android Git Automerger
parent 6a7a24cc5a a031ae8c82
commit c7587ddefa
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/connectivity/PacManager.java
View File

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