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

Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."

Browse Source 
am: 4e9a6e4c53

Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
This commit is contained in:
Chalard Jean
2019-03-11 04:21:36 -07:00
committed by android-build-merger
parent 76cc41871e 4e9a6e4c53
commit 407b351d68
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,8 +208,7 @@ public class ProxyTracker {
public void sendProxyBroadcast() { public void sendProxyBroadcast() {
final ProxyInfo defaultProxy = getDefaultProxy(); final ProxyInfo defaultProxy = getDefaultProxy();
final ProxyInfo proxyInfo = null != defaultProxy ? defaultProxy : new ProxyInfo("", 0, ""); final ProxyInfo proxyInfo = null != defaultProxy ? defaultProxy : new ProxyInfo("", 0, "");
if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) == PacManager.DONT_SEND_BROADCAST) {
== PacManager.ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST) {
return; return;
} }
if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo); if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo);