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

Set setCurrentProxyScriptUrl as public am: 26dbdc853b am: c5939ce4da

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If93a3c5a9145ac8993f5ee153a87018eed67502b
This commit is contained in:
Remi NGUYEN VAN
2021-01-07 09:49:41 +00:00
committed by Automerger Merge Worker
parent 6e82c52947 c5939ce4da
commit 0d28453111
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.