Merge "Fix error when PAC set rapidly" into klp-dev (c09e5911) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,7 @@ public class PacManager {
	*/		*/
	public synchronized boolean setCurrentProxyScriptUrl(ProxyProperties proxy) {		public synchronized boolean setCurrentProxyScriptUrl(ProxyProperties proxy) {
	if (!TextUtils.isEmpty(proxy.getPacFileUrl())) {		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.		// Allow to send broadcast, nothing to do.
	return false;		return false;
	}		}