Leave unmetered Wi-Fi network policies intact.

They are now removed when the WifiConfiguration is deleted.

Bug: 6344821, 6369307
Change-Id: Id411fa06cec10435501ef03c56d0bcb96ed229db
This commit is contained in:
Jeff Sharkey
2012-04-19 23:02:09 -07:00
parent fcc5063e4d
commit bf60154a45
2 changed files with 1 additions and 17 deletions

View File

@@ -214,13 +214,6 @@ public class NetworkPolicyEditor {
} else {
if (policy == null) {
// ignore when policy doesn't exist
} else if (policy.template.getMatchRule() == MATCH_WIFI
&& policy.warningBytes == WARNING_DISABLED
&& policy.limitBytes == LIMIT_DISABLED) {
// when WIFI goes unmetered, and no other warning/limit for
// policy, clean it up.
mPolicies.remove(policy);
modified = true;
} else if (policy.metered) {
policy.metered = false;
policy.inferred = false;