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
This commit is contained in:
Remi NGUYEN VAN
2021-01-08 01:19:44 +00:00
parent 3a67cc18fc
commit 082bcc67e7

View File

@@ -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.