Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2

am: b1480c8cab Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
2017-05-02 17:48:41 +00:00
parent 19323ca297 b1480c8cab
commit d0cb54b27e
1 changed files with 5 additions and 2 deletions
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
@@ -105,8 +105,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();
+                }
            }
        }
    }