PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remember when NetworkPolicy was inferred.

Browse Source 
Change-Id: If2e8ba37fa166e1711650b87392af2ac3a418269
This commit is contained in:
Jeff Sharkey
2012-03-20 16:52:43 -07:00
parent 11d3012c78
commit 012c16b62c
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/net/NetworkPolicyEditor.java
View File

@@ -139,6 +139,7 @@ public class NetworkPolicyEditor {
return null; return null;
} }
@Deprecated
private static NetworkPolicy buildDefaultPolicy(NetworkTemplate template) { private static NetworkPolicy buildDefaultPolicy(NetworkTemplate template) {
// TODO: move this into framework to share with NetworkPolicyManagerService // TODO: move this into framework to share with NetworkPolicyManagerService
final Time time = new Time(); final Time time = new Time();
@@ -146,8 +147,8 @@ public class NetworkPolicyEditor {
final int cycleDay = time.monthDay; final int cycleDay = time.monthDay;
final String cycleTimezone = time.timezone; final String cycleTimezone = time.timezone;
return new NetworkPolicy( return new NetworkPolicy(template, cycleDay, cycleTimezone, WARNING_DISABLED,
template, cycleDay, cycleTimezone, WARNING_DISABLED, LIMIT_DISABLED, true); LIMIT_DISABLED, SNOOZE_NEVER, SNOOZE_NEVER, true, false);
} }
public int getPolicyCycleDay(NetworkTemplate template) { public int getPolicyCycleDay(NetworkTemplate template) {
@@ -158,6 +159,7 @@ public class NetworkPolicyEditor {
final NetworkPolicy policy = getOrCreatePolicy(template); final NetworkPolicy policy = getOrCreatePolicy(template);
policy.cycleDay = cycleDay; policy.cycleDay = cycleDay;
policy.cycleTimezone = cycleTimezone; policy.cycleTimezone = cycleTimezone;
policy.inferred = false;
policy.clearSnooze(); policy.clearSnooze();
writeAsync(); writeAsync();
} }
@@ -169,6 +171,7 @@ public class NetworkPolicyEditor {
public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) { public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
final NetworkPolicy policy = getOrCreatePolicy(template); final NetworkPolicy policy = getOrCreatePolicy(template);
policy.warningBytes = warningBytes; policy.warningBytes = warningBytes;
policy.inferred = false;
policy.clearSnooze(); policy.clearSnooze();
writeAsync(); writeAsync();
} }
@@ -180,6 +183,7 @@ public class NetworkPolicyEditor {
public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) { public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
final NetworkPolicy policy = getOrCreatePolicy(template); final NetworkPolicy policy = getOrCreatePolicy(template);
policy.limitBytes = limitBytes; policy.limitBytes = limitBytes;
policy.inferred = false;
policy.clearSnooze(); policy.clearSnooze();
writeAsync(); writeAsync();
} }
@@ -254,21 +258,21 @@ public class NetworkPolicyEditor {
: policy4g; : policy4g;
mPolicies.remove(policy3g); mPolicies.remove(policy3g);
mPolicies.remove(policy4g); mPolicies.remove(policy4g);
mPolicies.add(new NetworkPolicy( mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
templateAll, restrictive.cycleDay, restrictive.cycleTimezone, restrictive.cycleTimezone, restrictive.warningBytes, restrictive.limitBytes,
restrictive.warningBytes, restrictive.limitBytes, restrictive.metered)); SNOOZE_NEVER, SNOOZE_NEVER, restrictive.metered, restrictive.inferred));
return true; return true;
} else if (!beforeSplit && split) { } else if (!beforeSplit && split) {
// duplicate existing policy into two rules // duplicate existing policy into two rules
final NetworkPolicy policyAll = getPolicy(templateAll); final NetworkPolicy policyAll = getPolicy(templateAll);
mPolicies.remove(policyAll); mPolicies.remove(policyAll);
mPolicies.add(new NetworkPolicy( mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.cycleTimezone,
template3g, policyAll.cycleDay, policyAll.cycleTimezone, policyAll.warningBytes, policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
policyAll.limitBytes, policyAll.metered)); policyAll.metered, policyAll.inferred));
mPolicies.add(new NetworkPolicy( mPolicies.add(new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.cycleTimezone,
template4g, policyAll.cycleDay, policyAll.cycleTimezone, policyAll.warningBytes, policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
policyAll.limitBytes, policyAll.metered)); policyAll.metered, policyAll.inferred));
return true; return true;
} else { } else {
return false; return false;