diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-01-08 01:19:44 +0000 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2021-01-08 01:22:58 +0000 |
| commit | 082bcc67e724d83e22ae3b60eaada5b8dc97706f (patch) | |
| tree | a9b7cc0902d8aeb8915a67e11a94b92fd972c759 | |
| parent | 3a67cc18fc72c6407c43ac2761fe7aaeafa35f8d (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/connectivity/PacManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java index 06721aea5540..93930ae16de8 100644 --- a/services/core/java/com/android/server/connectivity/PacManager.java +++ b/services/core/java/com/android/server/connectivity/PacManager.java @@ -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. |