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

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

Browse Source 
* commit 'b46eb9042b25d9b35ae2e05aba7063c8ee4f006c':
  Fix error when PAC set rapidly
This commit is contained in:
Jason Monk
2013-10-15 05:06:40 -07:00
committed by Android Git Automerger
parent f96b93e22c b46eb9042b
commit cc4d2e0fa5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/connectivity/PacManager.java
View File

@@ -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;
}