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

am 75051c3a: am 7f6d8754: am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev

Browse Source 
* commit '75051c3a62123b4668231d0243ba11462e02ac5a':
  Push firewall rules up to ConnectivityService.
This commit is contained in:
Jeff Sharkey
2015-10-12 16:55:58 +00:00
committed by Android Git Automerger
parent 8cbd7c8a8a 75051c3a62
commit f20a5700a4
3 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/net/NetworkPolicyManager.java
View File

@@ -51,12 +51,13 @@ public class NetworkPolicyManager {
public static final int POLICY_ALLOW_BACKGROUND_BATTERY_SAVE = 0x2;
/* RULE_* are not masks and they must be exclusive */
public static final int RULE_UNKNOWN = -1;
/** All network traffic should be allowed. */
public static final int RULE_ALLOW_ALL = 0x0;
public static final int RULE_ALLOW_ALL = 0;
/** Reject traffic on metered networks. */
public static final int RULE_REJECT_METERED = 0x1;
public static final int RULE_REJECT_METERED = 1;
/** Reject traffic on all networks. */
public static final int RULE_REJECT_ALL = 0x2;
public static final int RULE_REJECT_ALL = 2;
public static final int FIREWALL_RULE_DEFAULT = 0;
public static final int FIREWALL_RULE_ALLOW = 1;
@@ -375,25 +376,4 @@ public class NetworkPolicyManager {
// nothing found above; we can apply policy to UID
return true;
}
/** {@hide} */
public static void dumpPolicy(PrintWriter fout, int policy) {
fout.write("[");
if ((policy & POLICY_REJECT_METERED_BACKGROUND) != 0) {
fout.write("REJECT_METERED_BACKGROUND");
}
fout.write("]");
}
/** {@hide} */
public static void dumpRules(PrintWriter fout, int rules) {
fout.write("[");
if ((rules & RULE_REJECT_METERED) != 0) {
fout.write("REJECT_METERED");
} else if ((rules & RULE_REJECT_ALL) != 0) {
fout.write("REJECT_ALL");
}
fout.write("]");
}
}