summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Jurka <mikejurka@google.com> 2012-10-22 10:56:18 -0700
committer Michael Jurka <mikejurka@google.com> 2012-10-22 10:56:18 -0700
commit2a430cccc2a801da72e212d5c5b6a63676e4860c (patch)
treeac43c5548d359eb14b63d0381925ce002eba371c
parentcc0106cd99831ce7d3715e3c85e5b3e6c5c6ca78 (diff)
Add NPE check to fix crash in Recents
Bug: 7383315
-rw-r--r--packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java b/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
index 9d6765a7b9ba..4338fa04cea4 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 @@ public class RecentTasksLoader implements View.OnTouchListener {
item = createTaskDescription(recentInfo.id,
recentInfo.persistentId, recentInfo.baseIntent,
recentInfo.origActivity, recentInfo.description);
- loadThumbnailAndIcon(item);
+ if (item != null) {
+ loadThumbnailAndIcon(item);
+ }
return item;
}
return null;