Merge "Check for null when updating header" into oc-dev

am: 010484f7c3 Change-Id: I902a5339f0d62ff14e2f9aa43eae7036d98c45e1
2017-04-05 21:35:05 +00:00
parent 44132cec43 010484f7c3
commit 360bde1e85
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -524,7 +524,7 @@ public class TaskViewHeader extends FrameLayout
     * changes.
     */
    public void onTaskDataLoaded() {
-        if (mTask.icon != null) {
+        if (mTask != null && mTask.icon != null) {
            mIconView.setImageDrawable(mTask.icon);
        }
    }