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

am 0cd68e04: am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"

Browse Source 
* commit '0cd68e04a9f74aa5afc3e843db498568dd5fa173':
  Fix null pointer exceptions in NetworkPolicyEditor
This commit is contained in:
Jeff Sharkey
2014-01-10 23:14:20 +00:00
committed by Android Git Automerger
parent 200b6c6323 0cd68e04a9
commit ba646e3af1
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,8 @@ public class NetworkPolicyEditor {
}
public int getPolicyCycleDay(NetworkTemplate template) {
return getPolicy(template).cycleDay;
final NetworkPolicy policy = getPolicy(template);
return (policy != null) ? policy.cycleDay : -1;
}
public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cycleTimezone) {
@@ -173,7 +174,8 @@ public class NetworkPolicyEditor {
}
public long getPolicyWarningBytes(NetworkTemplate template) {
return getPolicy(template).warningBytes;
final NetworkPolicy policy = getPolicy(template);
return (policy != null) ? policy.warningBytes : WARNING_DISABLED;
}
public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
@@ -185,7 +187,8 @@ public class NetworkPolicyEditor {
}
public long getPolicyLimitBytes(NetworkTemplate template) {
return getPolicy(template).limitBytes;
final NetworkPolicy policy = getPolicy(template);
return (policy != null) ? policy.limitBytes : LIMIT_DISABLED;
}
public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
@@ -309,8 +312,16 @@ public class NetworkPolicyEditor {
final NetworkPolicy policy3g = getPolicy(template3g);
final NetworkPolicy policy4g = getPolicy(template4g);
final NetworkPolicy restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g
: policy4g;
NetworkPolicy restrictive = null;
if ((policy3g == null) && (policy4g == null)) {
return false;
} else if (policy3g == null) {
restrictive = policy4g;
} else if (policy4g == null) {
restrictive = policy3g;
} else {
restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g : policy4g;
}
mPolicies.remove(policy3g);
mPolicies.remove(policy4g);
mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
@@ -321,6 +332,9 @@ public class NetworkPolicyEditor {
} else if (!beforeSplit && split) {
// duplicate existing policy into two rules
final NetworkPolicy policyAll = getPolicy(templateAll);
if (policyAll == null) {
return false;
}
mPolicies.remove(policyAll);
mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.cycleTimezone,
policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,