From e4b5d69493e1fd6deba2a869acf9bc365c4ac5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miao=20Miao=20=28=E8=8B=97=E8=8B=97=29?= Date: Tue, 14 Mar 2017 15:51:54 +0800 Subject: [PATCH] Settings crash when receiving data state broadcast Stress/Stability testing, Settings crash when receiving data state broadcast Solution: Do null judgement before function was called Test: Stress/Stability test Change-Id: Id71448ed89eeffcea268c4a2e7154d9ea7639db4 --- .../dashboard/conditional/CellularDataCondition.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java index c28d9faf8d3..59cfa5d1ef0 100644 --- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java +++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java @@ -93,8 +93,11 @@ public class CellularDataCondition extends Condition { public void onReceive(Context context, Intent intent) { if (TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED.equals( intent.getAction())) { - ConditionManager.get(context).getCondition(CellularDataCondition.class) - .refreshState(); + CellularDataCondition condition = ConditionManager.get(context).getCondition( + CellularDataCondition.class); + if (condition != null) { + condition.refreshState(); + } } } }