From 3fef7230d2d4c9e8bd49e52e7f319303f2867177 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 29 Apr 2016 18:00:03 +0900 Subject: [PATCH] Address review comments on ag/962875. Bug: 27824851 Change-Id: I7dd553a926b10faf6e0c2b0e3ed9d8e91b3cccf0 --- .../java/com/android/server/NetworkManagementService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 9fc17a2a3a29a..d73b06b07584e 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -2048,13 +2048,13 @@ public class NetworkManagementService extends INetworkManagementService.Stub } } - private void closeSocketsForFirewallChain(int chain, String chainName) { + private void closeSocketsForFirewallChainLocked(int chain, String chainName) { // UID ranges to close sockets on. UidRange[] ranges; // UID ranges whose sockets we won't touch. int[] exemptUids; - SparseIntArray rules = getUidFirewallRules(chain); + final SparseIntArray rules = getUidFirewallRules(chain); int numUids = 0; if (getFirewallType(chain) == FIREWALL_TYPE_WHITELIST) { @@ -2119,7 +2119,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub mFirewallChainStates.put(chain, enable); final String operation = enable ? "enable_chain" : "disable_chain"; - String chainName; + final String chainName; switch(chain) { case FIREWALL_CHAIN_STANDBY: chainName = FIREWALL_CHAIN_NAME_STANDBY; @@ -2146,7 +2146,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub // whitelist and blacklist chains allow RSTs through. if (enable) { if (DBG) Slog.d(TAG, "Closing sockets after enabling chain " + chainName); - closeSocketsForFirewallChain(chain, chainName); + closeSocketsForFirewallChainLocked(chain, chainName); } } }