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

Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev

Browse Source 
am: 7a349d7288

Change-Id: Ie01c1ba49bd72a4690d2f29689bc94f9fd793cb8
This commit is contained in:
Sudheer Shanka
2017-10-04 07:03:28 +00:00
committed by android-build-merger
parent 6deac2efb9 7a349d7288
commit 99ae0aed0d
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -332,7 +332,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private static final int MSG_UPDATE_INTERFACE_QUOTA = 10; private static final int MSG_UPDATE_INTERFACE_QUOTA = 10;
private static final int MSG_REMOVE_INTERFACE_QUOTA = 11; private static final int MSG_REMOVE_INTERFACE_QUOTA = 11;
private static final int MSG_POLICIES_CHANGED = 13; private static final int MSG_POLICIES_CHANGED = 13;
private static final int MSG_SET_FIREWALL_RULES = 14;
private static final int MSG_RESET_FIREWALL_RULES_BY_UID = 15; private static final int MSG_RESET_FIREWALL_RULES_BY_UID = 15;
private static final int UID_MSG_STATE_CHANGED = 100; private static final int UID_MSG_STATE_CHANGED = 100;
@@ -3184,9 +3183,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
uidRules.put(mUidState.keyAt(i), FIREWALL_RULE_ALLOW); uidRules.put(mUidState.keyAt(i), FIREWALL_RULE_ALLOW);
} }
} }
setUidFirewallRulesAsync(chain, uidRules, CHAIN_TOGGLE_ENABLE); setUidFirewallRulesUL(chain, uidRules, CHAIN_TOGGLE_ENABLE);
} else { } else {
setUidFirewallRulesAsync(chain, null, CHAIN_TOGGLE_DISABLE); setUidFirewallRulesUL(chain, null, CHAIN_TOGGLE_DISABLE);
} }
} }
@@ -3253,7 +3252,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} }
} }
setUidFirewallRulesAsync(FIREWALL_CHAIN_STANDBY, uidRules, CHAIN_TOGGLE_NONE); setUidFirewallRulesUL(FIREWALL_CHAIN_STANDBY, uidRules, CHAIN_TOGGLE_NONE);
} finally { } finally {
Trace.traceEnd(Trace.TRACE_TAG_NETWORK); Trace.traceEnd(Trace.TRACE_TAG_NETWORK);
} }
@@ -3954,18 +3953,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
removeInterfaceQuota((String) msg.obj); removeInterfaceQuota((String) msg.obj);
return true; return true;
} }
case MSG_SET_FIREWALL_RULES: {
final int chain = msg.arg1;
final int toggle = msg.arg2;
final SparseIntArray uidRules = (SparseIntArray) msg.obj;
if (uidRules != null) {
setUidFirewallRules(chain, uidRules);
}
if (toggle != CHAIN_TOGGLE_NONE) {
enableFirewallChainUL(chain, toggle == CHAIN_TOGGLE_ENABLE);
}
return true;
}
case MSG_RESET_FIREWALL_RULES_BY_UID: { case MSG_RESET_FIREWALL_RULES_BY_UID: {
resetUidFirewallRules(msg.arg1); resetUidFirewallRules(msg.arg1);
return true; return true;
@@ -4111,15 +4098,20 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
/** /**
* Calls {@link #setUidFirewallRules(int, SparseIntArray)} and * Calls {@link #setUidFirewallRules(int, SparseIntArray)} and
* {@link #enableFirewallChainUL(int, boolean)} asynchronously. * {@link #enableFirewallChainUL(int, boolean)} synchronously.
* *
* @param chain firewall chain. * @param chain firewall chain.
* @param uidRules new UID rules; if {@code null}, only toggles chain state. * @param uidRules new UID rules; if {@code null}, only toggles chain state.
* @param toggle whether the chain should be enabled, disabled, or not changed. * @param toggle whether the chain should be enabled, disabled, or not changed.
*/ */
private void setUidFirewallRulesAsync(int chain, @Nullable SparseIntArray uidRules, private void setUidFirewallRulesUL(int chain, @Nullable SparseIntArray uidRules,
@ChainToggleType int toggle) { @ChainToggleType int toggle) {
mHandler.obtainMessage(MSG_SET_FIREWALL_RULES, chain, toggle, uidRules).sendToTarget(); if (uidRules != null) {
setUidFirewallRulesUL(chain, uidRules);
}
if (toggle != CHAIN_TOGGLE_NONE) {
enableFirewallChainUL(chain, toggle == CHAIN_TOGGLE_ENABLE);
}
} }
/** /**
@@ -4127,7 +4119,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
* here to netd. It will clean up dead rules and make sure the target chain only contains rules * here to netd. It will clean up dead rules and make sure the target chain only contains rules
* specified here. * specified here.
*/ */
private void setUidFirewallRules(int chain, SparseIntArray uidRules) { private void setUidFirewallRulesUL(int chain, SparseIntArray uidRules) {
try { try {
int size = uidRules.size(); int size = uidRules.size();
int[] uids = new int[size]; int[] uids = new int[size];