Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." (af5acad9) · Commits · e / os / android_frameworks_base

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

+6 −7

Original line number	Diff line number	Diff line
		@@ -70,9 +70,8 @@ public class PacManager {
		private static final long MAX_PAC_SIZE = 20 * 1000 * 1000;

		// Return values for #setCurrentProxyScriptUrl
		enum ToSendOrNotToSendBroadcast {
		DONT_SEND_BROADCAST, DO_SEND_BROADCAST
		}
		public static final boolean DONT_SEND_BROADCAST = false;
		public static final boolean DO_SEND_BROADCAST = true;

		private String mCurrentPac;
		@GuardedBy("mProxyLock")
		@@ -176,11 +175,11 @@ public class PacManager {
		* @param proxy Proxy information that is about to be broadcast.
		* @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_BROADCAST
		*/
		synchronized ToSendOrNotToSendBroadcast setCurrentProxyScriptUrl(ProxyInfo proxy) {
		synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {
		if (!Uri.EMPTY.equals(proxy.getPacFileUrl())) {
		if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {
		// Allow to send broadcast, nothing to do.
		return ToSendOrNotToSendBroadcast.DO_SEND_BROADCAST;
		return DO_SEND_BROADCAST;
		}
		mPacUrl = proxy.getPacFileUrl();
		mCurrentDelay = DELAY_1;
		@@ -188,7 +187,7 @@ public class PacManager {
		mHasDownloaded = false;
		getAlarmManager().cancel(mPacRefreshIntent);
		bind();
		return ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST;
		return DONT_SEND_BROADCAST;
		} else {
		getAlarmManager().cancel(mPacRefreshIntent);
		synchronized (mProxyLock) {
		@@ -204,7 +203,7 @@ public class PacManager {
		}
		}
		}
		return ToSendOrNotToSendBroadcast.DO_SEND_BROADCAST;
		return DO_SEND_BROADCAST;
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -208,8 +208,7 @@ public class ProxyTracker {
		public void sendProxyBroadcast() {
		final ProxyInfo defaultProxy = getDefaultProxy();
		final ProxyInfo proxyInfo = null != defaultProxy ? defaultProxy : new ProxyInfo("", 0, "");
		if (mPacManager.setCurrentProxyScriptUrl(proxyInfo)
		== PacManager.ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST) {
		if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) == PacManager.DONT_SEND_BROADCAST) {
		return;
		}
		if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo);