Merge "Fix error when PAC set rapidly" into klp-dev

This commit is contained in:
Jason Monk
2013-10-15 11:15:00 +00:00
committed by Android (Google) Code Review

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