Skip to content

Commit 39c6526

Browse files
mikejurkaAndroid (Google) Code Review
authored andcommitted
Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
2 parents d6e3ad5 + 2a430cc commit 39c6526

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,9 @@ public TaskDescription loadFirstTask() {
386386
item = createTaskDescription(recentInfo.id,
387387
recentInfo.persistentId, recentInfo.baseIntent,
388388
recentInfo.origActivity, recentInfo.description);
389-
loadThumbnailAndIcon(item);
389+
if (item != null) {
390+
loadThumbnailAndIcon(item);
391+
}
390392
return item;
391393
}
392394
return null;

0 commit comments

Comments
 (0)