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

Avoid NPE when template rapidly switched.

Browse Source 
Monkeys can race and end up swapping template before the dialog
is shown.

Bug: 16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
This commit is contained in:
Jeff Sharkey
2014-08-08 10:25:24 -07:00
parent 6cd90f45b7
commit d0a5531576
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) { public static void show(DataUsageSummary parent) {
if (!parent.isAdded()) return; if (!parent.isAdded()) return;
final NetworkPolicy policy = parent.mPolicyEditor.getPolicy(parent.mTemplate);
if (policy == null) return;
final Resources res = parent.getResources(); final Resources res = parent.getResources();
final CharSequence message; final CharSequence message;
final long minLimitBytes = (long) ( final long minLimitBytes = (long) (policy.warningBytes * 1.2f);
parent.mPolicyEditor.getPolicy(parent.mTemplate).warningBytes * 1.2f);
final long limitBytes; final long limitBytes;
// TODO: customize default limits based on network template // TODO: customize default limits based on network template