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

Merge "Avoid NPE when template rapidly switched." into lmp-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2014-08-08 17:32:39 +00:00
committed by Android (Google) Code Review
parent 14f6029657 d0a5531576
commit dc16286ff3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/DataUsageSummary.java
View File

@@ -1791,10 +1791,12 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
public static void show(DataUsageSummary parent) {
if (!parent.isAdded()) return;
final NetworkPolicy policy = parent.mPolicyEditor.getPolicy(parent.mTemplate);
if (policy == null) return;
final Resources res = parent.getResources();
final CharSequence message;
final long minLimitBytes = (long) (
parent.mPolicyEditor.getPolicy(parent.mTemplate).warningBytes * 1.2f);
final long minLimitBytes = (long) (policy.warningBytes * 1.2f);
final long limitBytes;
// TODO: customize default limits based on network template