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

2017-04-05 21:29:55 +00:00
parent 0d47527058 2390ec2e83
commit 010484f7c3
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);
        }
    }