From d0a55315761bac64c3e53484def02da3644b1632 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 8 Aug 2014 10:25:24 -0700 Subject: [PATCH] Avoid NPE when template rapidly switched. Monkeys can race and end up swapping template before the dialog is shown. Bug: 16660160 Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825 --- src/com/android/settings/DataUsageSummary.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index ec521281121..009c7583cba 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -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