Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d166333e authored Oct 20, 2015 by Kevin Cernekee Committed by android-build-merger Oct 20, 2015

Merge "ignore initial request to disable iptable chain" into mnc-dr-dev

am: 3554d62c

* commit '3554d62c':
  ignore initial request to disable iptable chain

parents 07de80bd 3554d62c

services/core/java/com/android/server/NetworkManagementService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -2023,9 +2023,9 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		public void setFirewallChainEnabled(int chain, boolean enable) {
		enforceSystemUid();
		synchronized (mQuotaLock) {
		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);

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);