Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" (104426a0) · Commits · e / os / android_frameworks_base

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

+35 −41

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.connectivity;

		import android.annotation.NonNull;
		import android.annotation.WorkerThread;
		import android.app.AlarmManager;
		import android.app.PendingIntent;
		@@ -72,6 +71,10 @@ public class PacProxyInstaller {
		private static final int DELAY_LONG = 4;
		private static final long MAX_PAC_SIZE = 20 * 1000 * 1000;

		// Return values for #setCurrentProxyScriptUrl
		public static final boolean DONT_SEND_BROADCAST = false;
		public static final boolean DO_SEND_BROADCAST = true;

		private String mCurrentPac;
		@GuardedBy("mProxyLock")
		private volatile Uri mPacUrl = Uri.EMPTY;
		@@ -90,7 +93,7 @@ public class PacProxyInstaller {
		private volatile boolean mHasSentBroadcast;
		private volatile boolean mHasDownloaded;

		private final Handler mConnectivityHandler;
		private Handler mConnectivityHandler;
		private final int mProxyMessage;

		/**
		@@ -98,13 +101,6 @@ public class PacProxyInstaller {
		*/
		private final Object mProxyLock = new Object();

		/**
		* Lock ensuring consistency between the values of mHasSentBroadcast, mHasDownloaded, the
		* last URL and port, and the broadcast message being sent with the correct arguments.
		* TODO : this should probably protect all instances of these variables
		*/
		private final Object mBroadcastStateLock = new Object();

		/**
		* Runnable to download PAC script.
		* The behavior relies on the assumption it always runs on mNetThread to guarantee that the
		@@ -150,7 +146,7 @@ public class PacProxyInstaller {
		}
		}

		public PacProxyInstaller(@NonNull Context context, @NonNull Handler handler, int proxyMessage) {
		public PacProxyInstaller(Context context, Handler handler, int proxyMessage) {
		mContext = context;
		mLastPort = -1;
		final HandlerThread netThread = new HandlerThread("android.pacproxyinstaller",
		@@ -180,17 +176,21 @@ public class PacProxyInstaller {
		* PacProxyInstaller will trigger a new broadcast when it is ready.
		*
		* @param proxy Proxy information that is about to be broadcast.
		* @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_BROADCAST
		*/
		public void setCurrentProxyScriptUrl(@NonNull ProxyInfo proxy) {
		synchronized (mBroadcastStateLock) {
		public synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {
		if (!Uri.EMPTY.equals(proxy.getPacFileUrl())) {
		if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) return;
		if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {
		// Allow to send broadcast, nothing to do.
		return DO_SEND_BROADCAST;
		}
		mPacUrl = proxy.getPacFileUrl();
		mCurrentDelay = DELAY_1;
		mHasSentBroadcast = false;
		mHasDownloaded = false;
		getAlarmManager().cancel(mPacRefreshIntent);
		bind();
		return DONT_SEND_BROADCAST;
		} else {
		getAlarmManager().cancel(mPacRefreshIntent);
		synchronized (mProxyLock) {
		@@ -200,7 +200,7 @@ public class PacProxyInstaller {
		unbind();
		}
		}
		}
		return DO_SEND_BROADCAST;
		}
		}

		@@ -275,7 +275,6 @@ public class PacProxyInstaller {
		getAlarmManager().set(AlarmManager.ELAPSED_REALTIME, timeTillTrigger, mPacRefreshIntent);
		}

		@GuardedBy("mProxyLock")
		private void setCurrentProxyScript(String script) {
		if (mProxyService == null) {
		Log.e(TAG, "setCurrentProxyScript: no proxy service");
		@@ -348,9 +347,6 @@ public class PacProxyInstaller {
		public void setProxyPort(int port) {
		if (mLastPort != -1) {
		// Always need to send if port changed
		// TODO: Here lacks synchronization because this write cannot
		// guarantee that it's visible from sendProxyIfNeeded() when
		// it's called by a Runnable which is post by mNetThread.
		mHasSentBroadcast = false;
		}
		mLastPort = port;
		@@ -390,8 +386,7 @@ public class PacProxyInstaller {
		mConnectivityHandler.sendMessage(mConnectivityHandler.obtainMessage(mProxyMessage, proxy));
		}

		private void sendProxyIfNeeded() {
		synchronized (mBroadcastStateLock) {
		private synchronized void sendProxyIfNeeded() {
		if (!mHasDownloaded \|\| (mLastPort == -1)) {
		return;
		}
		@@ -401,4 +396,3 @@ public class PacProxyInstaller {
		}
		}
		}
		}

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -226,9 +226,9 @@ public class ProxyTracker {
		final ProxyInfo defaultProxy = getDefaultProxy();
		final ProxyInfo proxyInfo = null != defaultProxy ?
		defaultProxy : ProxyInfo.buildDirectProxy("", 0, Collections.emptyList());
		mPacProxyInstaller.setCurrentProxyScriptUrl(proxyInfo);

		if (!shouldSendBroadcast(proxyInfo)) {
		if (mPacProxyInstaller.setCurrentProxyScriptUrl(proxyInfo)
		== PacProxyInstaller.DONT_SEND_BROADCAST) {
		return;
		}
		if (DBG) Log.d(TAG, "sending Proxy Broadcast for " + proxyInfo);
		@@ -244,13 +244,6 @@ public class ProxyTracker {
		}
		}

		private boolean shouldSendBroadcast(ProxyInfo proxy) {
		if (Uri.EMPTY.equals(proxy.getPacFileUrl())) return false;
		if (proxy.getPacFileUrl().equals(proxy.getPacFileUrl())
		&& (proxy.getPort() > 0)) return true;
		return true;
		}

		/**
		* Sets the global proxy in memory. Also writes the values to the global settings of the device.
		*