Restrict app data on metered networks.

Paired with framework change that no longer requires NetworkPolicy
to have limit when restricting apps.

Bug: 5571454
Change-Id: I2a5d8446a9278afb183e13d0f41f436ccb3bc9e8
This commit is contained in:
Jeff Sharkey
2011-11-30 15:37:51 -08:00
parent 459a531da4
commit 3038c52de4
2 changed files with 11 additions and 26 deletions

View File

@@ -146,7 +146,7 @@ public class NetworkPolicyEditor {
final int cycleDay = time.monthDay;
return new NetworkPolicy(
template, cycleDay, WARNING_DISABLED, LIMIT_DISABLED, SNOOZE_NEVER);
template, cycleDay, WARNING_DISABLED, LIMIT_DISABLED, SNOOZE_NEVER, true);
}
public int getPolicyCycleDay(NetworkTemplate template) {
@@ -251,7 +251,7 @@ public class NetworkPolicyEditor {
mPolicies.remove(policy4g);
mPolicies.add(
new NetworkPolicy(templateAll, restrictive.cycleDay, restrictive.warningBytes,
restrictive.limitBytes, SNOOZE_NEVER));
restrictive.limitBytes, SNOOZE_NEVER, restrictive.metered));
return true;
} else if (!beforeSplit && split) {
@@ -260,10 +260,10 @@ public class NetworkPolicyEditor {
mPolicies.remove(policyAll);
mPolicies.add(
new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.warningBytes,
policyAll.limitBytes, SNOOZE_NEVER));
policyAll.limitBytes, SNOOZE_NEVER, policyAll.metered));
mPolicies.add(
new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.warningBytes,
policyAll.limitBytes, SNOOZE_NEVER));
policyAll.limitBytes, SNOOZE_NEVER, policyAll.metered));
return true;
} else {
return false;