Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address review comments on ag/962875." into nyc-dev

Browse Source 
am: 6d1a776c26

* commit '6d1a776c26206ea44339f19e13b413aa7d25bd6d':
  Address review comments on ag/962875.

Change-Id: I201ec9b9d3d687f9b8aaba71a7e0a75cb5019319
This commit is contained in:
Lorenzo Colitti
2016-04-30 09:23:53 +00:00
committed by android-build-merger
parent 1616125d53 6d1a776c26
commit 21f19f3d64
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -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);
}
}
}