Merge "Fully remove startPacSystem() and stopPacSystem()" (c7b4009f) · Commits · e / os / android_frameworks_base

packages/services/PacProcessor/src/com/android/net/IProxyService.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,4 @@ interface IProxyService
		String resolvePacFile(String host, String url);

		oneway void setPacFile(String scriptContents);

		oneway void startPacSystem();
		oneway void stopPacSystem();
		}

+0 −10

Original line number	Diff line number	Diff line
		@@ -83,15 +83,5 @@ public class PacService extends Service {
		}
		mPacNative.setCurrentProxyScript(script);
		}

		@Override
		public void startPacSystem() throws RemoteException {
		//TODO: remove
		}

		@Override
		public void stopPacSystem() throws RemoteException {
		//TODO: remove
		}
		}
		}

+1 −12

Original line number	Diff line number	Diff line
		@@ -196,15 +196,9 @@ public class PacManager {
		mPacUrl = Uri.EMPTY;
		mCurrentPac = null;
		if (mProxyService != null) {
		try {
		mProxyService.stopPacSystem();
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to stop PAC service", e);
		} finally {
		unbind();
		}
		}
		}
		return DO_SEND_BROADCAST;
		}
		}
		@@ -327,11 +321,6 @@ public class PacManager {
		if (mProxyService == null) {
		Log.e(TAG, "No proxy service");
		} else {
		try {
		mProxyService.startPacSystem();
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e);
		}
		mNetThreadHandler.post(mPacDownloader);
		}
		}