From 2a430cccc2a801da72e212d5c5b6a63676e4860c Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Mon, 22 Oct 2012 10:56:18 -0700 Subject: Add NPE check to fix crash in Recents Bug: 7383315 --- .../SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3-59-g8ed1b