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

Merge "Update for NetworkPolicy refactoring."

Browse Source
This commit is contained in:
Jeff Sharkey
2012-02-02 16:26:46 -08:00
committed by Android (Google) Code Review
parent 840c6bfb96 0d750bba7d
commit 0370b9c3f7
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,8 +145,7 @@ public class NetworkPolicyEditor {
time.setToNow(); time.setToNow();
final int cycleDay = time.monthDay; final int cycleDay = time.monthDay;
return new NetworkPolicy( return new NetworkPolicy(template, cycleDay, WARNING_DISABLED, LIMIT_DISABLED, true);
template, cycleDay, WARNING_DISABLED, LIMIT_DISABLED, SNOOZE_NEVER, true);
} }
public int getPolicyCycleDay(NetworkTemplate template) { public int getPolicyCycleDay(NetworkTemplate template) {
@@ -156,7 +155,7 @@ public class NetworkPolicyEditor {
public void setPolicyCycleDay(NetworkTemplate template, int cycleDay) { public void setPolicyCycleDay(NetworkTemplate template, int cycleDay) {
final NetworkPolicy policy = getOrCreatePolicy(template); final NetworkPolicy policy = getOrCreatePolicy(template);
policy.cycleDay = cycleDay; policy.cycleDay = cycleDay;
policy.lastSnooze = SNOOZE_NEVER; policy.clearSnooze();
writeAsync(); writeAsync();
} }
@@ -167,7 +166,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.lastSnooze = SNOOZE_NEVER; policy.clearSnooze();
writeAsync(); writeAsync();
} }
@@ -178,7 +177,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.lastSnooze = SNOOZE_NEVER; policy.clearSnooze();
writeAsync(); writeAsync();
} }
@@ -249,21 +248,18 @@ public class NetworkPolicyEditor {
: policy4g; : policy4g;
mPolicies.remove(policy3g); mPolicies.remove(policy3g);
mPolicies.remove(policy4g); mPolicies.remove(policy4g);
mPolicies.add( mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
new NetworkPolicy(templateAll, restrictive.cycleDay, restrictive.warningBytes, restrictive.warningBytes, restrictive.limitBytes, restrictive.metered));
restrictive.limitBytes, SNOOZE_NEVER, restrictive.metered));
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( mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.warningBytes,
new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.warningBytes, policyAll.limitBytes, policyAll.metered));
policyAll.limitBytes, SNOOZE_NEVER, policyAll.metered)); mPolicies.add(new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.warningBytes,
mPolicies.add( policyAll.limitBytes, policyAll.metered));
new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.warningBytes,
policyAll.limitBytes, SNOOZE_NEVER, policyAll.metered));
return true; return true;
} else { } else {
return false; return false;