Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97d232b365e868b1533d0600778f7dbb823a4d2a
This commit is contained in:
Remi NGUYEN VAN
2021-01-12 02:01:42 +00:00
committed by Automerger Merge Worker
parent 22d9f95a9a 5aec9c87e4
commit aab03fb10c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/PacManager.java
View File

@@ -177,7 +177,7 @@ public class PacManager {
* @param proxy Proxy information that is about to be broadcast. * @param proxy Proxy information that is about to be broadcast.
* @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_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 (!Uri.EMPTY.equals(proxy.getPacFileUrl())) {
if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) { if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {
// Allow to send broadcast, nothing to do. // Allow to send broadcast, nothing to do.