Merge "Null check in onPostExecute."

2015-11-04 17:06:16 +00:00
parent e779213d8e bebd2a482e
commit 641b15b706
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -331,7 +331,9 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
        protected void onPostExecute(Drawable icon) {
            if (icon != null) {
                final Preference pref = prefReference.get();
-                pref.setIcon(icon);
+                if (pref != null) {
+                    pref.setIcon(icon);
+                }
            }
        }
    }