Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2974fcd authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am 6e48d399: am 662cfc2a: am 39c65262: Merge "Add NPE check to fix crash in... 

am 6e48d399: am 662cfc2a: am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev

* commit '6e48d399':
  Add NPE check to fix crash in Recents
parents 4fe4a600 6e48d399

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -386,7 +386,9 @@ public class RecentTasksLoader implements View.OnTouchListener { 
            item = createTaskDescription(recentInfo.id,

            item = createTaskDescription(recentInfo.id,

                    recentInfo.persistentId, recentInfo.baseIntent,

                    recentInfo.persistentId, recentInfo.baseIntent,

                    recentInfo.origActivity, recentInfo.description);

                    recentInfo.origActivity, recentInfo.description);

            if (item != null) {

                loadThumbnailAndIcon(item);

                loadThumbnailAndIcon(item);

            }

            return item;

            return item;

        }

        }

        return null;

        return null;