commit 39c6526249a27b9dd9252910adecf8353b0792f0
author Michael Jurka <mikejurka@google.com> Mon Oct 22 11:12:01 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 22 11:12:01 2012 -0700
tree c7949448d8052ea242164ef549bb79bc840961ee
parent d6e3ad54907ec085aa41e5c77296e9f385c22e67
parent 2a430cccc2a801da72e212d5c5b6a63676e4860c

Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev

packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java

diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java b/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
index 9d6765a..4338fa0 100644
--- a/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
+++ b/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
@@ -386,7 +386,9 @@
             item = createTaskDescription(recentInfo.id,
                     recentInfo.persistentId, recentInfo.baseIntent,
                     recentInfo.origActivity, recentInfo.description);
-            loadThumbnailAndIcon(item);
+            if (item != null) {
+                loadThumbnailAndIcon(item);
+            }
             return item;
         }
         return null;