diff options
| author | Kevin Cernekee <cernekee@google.com> | 2015-10-20 22:18:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 22:18:22 +0000 |
| commit | d166333eb5d3886a18a3a951d833a6d01cb8340d (patch) | |
| tree | e1a1d5f9ea3147dc209d1331c142ad547c023ddc /services/core/java/com/android/server/net | |
| parent | 07de80bd873c80dfcdaed5b992ac0ff01ed41483 (diff) | |
| parent | 3554d62ca02bf6bc7777d1b22699876ec388fe6c (diff) | |
| download | frameworks_base-d166333eb5d3886a18a3a951d833a6d01cb8340d.zip frameworks_base-d166333eb5d3886a18a3a951d833a6d01cb8340d.tar.gz frameworks_base-d166333eb5d3886a18a3a951d833a6d01cb8340d.tar.bz2 | |
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev
am: 3554d62ca0
* commit '3554d62ca02bf6bc7777d1b22699876ec388fe6c':
ignore initial request to disable iptable chain
Diffstat (limited to 'services/core/java/com/android/server/net')
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 893a24c..7c9c018 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -2598,9 +2598,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { * Add or remove a uid to the firewall blacklist for all network ifaces. */ private void enableFirewallChainLocked(int chain, boolean enable) { - if (mFirewallChainStates.indexOfKey(chain) >= 0 && - mFirewallChainStates.get(chain) == enable) { - // All is the same, nothing to do. + if (mFirewallChainStates.get(chain, false) == enable) { + // All is the same, nothing to do. This relies on the fact that netd has child + // chains default detached. return; } mFirewallChainStates.put(chain, enable); |