commit 2ed42d009b443fdd3da98cce9e6f641948d8ed7b
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 02 17:39:44 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 02 17:39:45 2017 +0000
tree 9c54a1136050c7a5912e622f119bb8e2232972b3
parent 04a7e0a73abcacf390be3d7ee2bb071841eb9a29
parent e4b5d69493e1fd6deba2a869acf9bc365c4ac5e1

Merge "Settings crash when receiving data state broadcast"

src/com/android/settings/dashboard/conditional/CellularDataCondition.java

diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
index c28d9fa..59cfa5d 100644
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
@@ -93,8 +93,11 @@
         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();
+                }
             }
         }
     }