diff options
| author | 2021-01-12 02:21:40 +0000 | |
|---|---|---|
| committer | 2021-01-12 02:21:40 +0000 | |
| commit | 0bf2dfbefcde24b3d2b8aada66ce516696b37ba1 (patch) | |
| tree | 3435d519e7aece038099419b6165ac78130591ab | |
| parent | 8c9499011f6ec4b0fe0a9d32421cdf9b7576ca3f (diff) | |
| parent | aab03fb10ccd5fb1753cdcf1a193581de535fc6a (diff) | |
Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4 am: aab03fb10c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I444f0f93b395be595e58b1766e4f94f1a046bf2d
| -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. |