Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev

2016-09-23 23:31:43 +00:00
parent 3843dd96f5 98487f4d65
commit c5bfd5f5a8
1 changed files with 5 additions and 2 deletions
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ b/src/com/android/settings/dashboard/conditional/DndCondition.java
@@ -139,8 +139,11 @@ public class DndCondition extends Condition {
        public void onReceive(Context context, Intent intent) {
            if (NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL
                    .equals(intent.getAction())) {
-                ConditionManager.get(context).getCondition(DndCondition.class)
-                        .refreshState();
+                final Condition condition =
+                        ConditionManager.get(context).getCondition(DndCondition.class);
+                if (condition != null) {
+                    condition.refreshState();
+                }
            }
        }
    }