From 2a67906ec5a49a638e97e7eb9e8b3cd6740e6afd Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Mon, 15 Oct 2018 14:27:15 +0900 Subject: [PATCH] [PT17.5] Revert to booleans for send/not send broadcast constants. In PT17, for security of the patch these two constants have been switched from boolean to enum values. While this is nice for making sure a patch is correct, it's also pretty wasteful. Now that it's certain that the values of these fields don't matter, they can be set to logical values (as opposed to reversed as it was the case before PT17. Test: runtest Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86 --- .../java/com/android/server/connectivity/ProxyTracker.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java index a671287324..e715890fb2 100644 --- a/services/core/java/com/android/server/connectivity/ProxyTracker.java +++ b/services/core/java/com/android/server/connectivity/ProxyTracker.java @@ -208,8 +208,7 @@ public class ProxyTracker { public void sendProxyBroadcast() { final ProxyInfo defaultProxy = getDefaultProxy(); final ProxyInfo proxyInfo = null != defaultProxy ? defaultProxy : new ProxyInfo("", 0, ""); - if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) - == PacManager.ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST) { + if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) == PacManager.DONT_SEND_BROADCAST) { return; } if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo);