Commit 082bcc67 authored Jan 08, 2021 by Remi NGUYEN VAN

Revert^2 "Set setCurrentProxyScriptUrl as public"

PacManager is part of services.jar, while ProxyManager is in
service-connectivity.jar. setCurrentProxyScriptUrl cannot be
package-private and called across jars.

As part of modularization of service-connectivity.jar, the
PacManager interface will then be formally defined.

This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.

Bug: 171540887
Test: Splitting service-connectivity, ProxyManager can reference the
      method

Change-Id: I1007be6c0101c4582bade182f9bc8dcfc4a1b303

parent 3a67cc18

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ 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 boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {
		public 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.