commit c6e3467cc245e2ff15c22e11dda732beccabece7
author Miao Miao (苗苗) <miao.miao@spreadtrum.com> Tue May 02 17:44:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 02 17:44:08 2017 +0000
tree 9c54a1136050c7a5912e622f119bb8e2232972b3
parent f8aaf9ecdc9c805620b5cef1793f32b491b33357
parent 2ed42d009b443fdd3da98cce9e6f641948d8ed7b

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

Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1

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();
+                }
             }
         }
     }