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

Commit 3554d62c authored Oct 20, 2015 by Kevin Cernekee Committed by Android (Google) Code Review Oct 20, 2015

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

parents cf43b552 690f18a5

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
		@@ -2511,9 +2511,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);