diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2015-10-12 16:39:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 16:39:34 +0000 |
| commit | 7f6d8754e6d509bf17fe0c46130c884b16706b12 (patch) | |
| tree | 213c5a3018b8d66ce887a493c2bf607b5effa870 /core/java/android/net | |
| parent | da5d9af80530e6bf662178668bef3ef3b926fe73 (diff) | |
| parent | a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9 (diff) | |
| download | frameworks_base-7f6d8754e6d509bf17fe0c46130c884b16706b12.zip frameworks_base-7f6d8754e6d509bf17fe0c46130c884b16706b12.tar.gz frameworks_base-7f6d8754e6d509bf17fe0c46130c884b16706b12.tar.bz2 | |
am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit 'a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9':
Push firewall rules up to ConnectivityService.
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/NetworkPolicyManager.java | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index 02dae8a..eab22b8 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -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("]"); - } - } |