From 2390ec2e838336e83588997ee17beb9649a63161 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 4 Apr 2017 14:06:30 +0200
Subject: [PATCH] Check for null when updating header

Test: Boot device, go to recents, scroll
Change-Id: I11935ac9931cd443a82229bbc295ace8ffc9a095
Fixes: 36531669
---
 .../src/com/android/systemui/recents/views/TaskViewHeader.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
index dc666e90fbdb4..311f8ffe258ff 100644
--- 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);
         }
     }