Merge "Settings crash when receiving data state broadcast"

am: 2ed42d009b Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
2017-05-02 17:44:08 +00:00
parent f8aaf9ecdc 2ed42d009b
commit c6e3467cc2
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
@@ -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();
+                }
            }
        }
    }