From 29f63aff0f03fa18b4bd9318948b26e404ad5d65 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Mon, 15 Oct 2018 14:27:15 +0900 Subject: [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/PacManager.java | 13 ++++++------- .../java/com/android/server/connectivity/ProxyTracker.java | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java index 97896889f243..1ac09ad462a1 100644 --- a/services/core/java/com/android/server/connectivity/PacManager.java +++ b/services/core/java/com/android/server/connectivity/PacManager.java @@ -70,9 +70,8 @@ public class PacManager { private static final long MAX_PAC_SIZE = 20 * 1000 * 1000; // Return values for #setCurrentProxyScriptUrl - enum ToSendOrNotToSendBroadcast { - DONT_SEND_BROADCAST, DO_SEND_BROADCAST - } + public static final boolean DONT_SEND_BROADCAST = false; + public static final boolean DO_SEND_BROADCAST = true; private String mCurrentPac; @GuardedBy("mProxyLock") @@ -176,11 +175,11 @@ public class PacManager { * @param proxy Proxy information that is about to be broadcast. * @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_BROADCAST */ - synchronized ToSendOrNotToSendBroadcast setCurrentProxyScriptUrl(ProxyInfo proxy) { + synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) { if (!Uri.EMPTY.equals(proxy.getPacFileUrl())) { if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) { // Allow to send broadcast, nothing to do. - return ToSendOrNotToSendBroadcast.DO_SEND_BROADCAST; + return DO_SEND_BROADCAST; } mPacUrl = proxy.getPacFileUrl(); mCurrentDelay = DELAY_1; @@ -188,7 +187,7 @@ public class PacManager { mHasDownloaded = false; getAlarmManager().cancel(mPacRefreshIntent); bind(); - return ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST; + return DONT_SEND_BROADCAST; } else { getAlarmManager().cancel(mPacRefreshIntent); synchronized (mProxyLock) { @@ -204,7 +203,7 @@ public class PacManager { } } } - return ToSendOrNotToSendBroadcast.DO_SEND_BROADCAST; + return DO_SEND_BROADCAST; } } diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java index a671287324af..e715890fb211 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); -- cgit v1.2.3-59-g8ed1b