LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method""

Browse Source
This commit is contained in:
Lorenzo Colitti
2021-02-03 13:05:35 +00:00
committed by Gerrit Code Review
parent ab4b0cdccc bb4c3ac73f
commit c4d0a33309
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/connectivity/ProxyTracker.java
View File

@@ -226,9 +226,9 @@ public class ProxyTracker {
final ProxyInfo defaultProxy = getDefaultProxy(); final ProxyInfo defaultProxy = getDefaultProxy();
final ProxyInfo proxyInfo = null != defaultProxy ? final ProxyInfo proxyInfo = null != defaultProxy ?
defaultProxy : ProxyInfo.buildDirectProxy("", 0, Collections.emptyList()); defaultProxy : ProxyInfo.buildDirectProxy("", 0, Collections.emptyList());
mPacProxyInstaller.setCurrentProxyScriptUrl(proxyInfo);
if (!shouldSendBroadcast(proxyInfo)) { if (mPacProxyInstaller.setCurrentProxyScriptUrl(proxyInfo)
== PacProxyInstaller.DONT_SEND_BROADCAST) {
return; return;
} }
if (DBG) Log.d(TAG, "sending Proxy Broadcast for " + proxyInfo); if (DBG) Log.d(TAG, "sending Proxy Broadcast for " + proxyInfo);
@@ -244,13 +244,6 @@ public class ProxyTracker {
} }
} }
private boolean shouldSendBroadcast(ProxyInfo proxy) {
if (Uri.EMPTY.equals(proxy.getPacFileUrl())) return false;
if (proxy.getPacFileUrl().equals(proxy.getPacFileUrl())
&& (proxy.getPort() > 0)) return true;
return true;
}
/** /**
* Sets the global proxy in memory. Also writes the values to the global settings of the device. * Sets the global proxy in memory. Also writes the values to the global settings of the device.
* *