From f4fdabf69811d844157daabdd500cf3db9d4ac19 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 16 Dec 2015 13:18:43 -0500
Subject: [PATCH] Adding catch for b/26221779

Change-Id: Id0cf455cd65bf5b202a6249b0b51351addb0bd17
---
 .../systemui/recents/model/RecentsTaskLoader.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
index 965e7a67489f7..c72d166b4cd50 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
@@ -237,10 +237,17 @@ class BackgroundTaskLoader implements Runnable {
 
     Drawable getTaskDescriptionIcon(Task.TaskKey taskKey, Bitmap iconBitmap, String iconFilename,
             SystemServicesProxy ssp, Resources res) {
-        Bitmap tdIcon = iconBitmap != null
-                ? iconBitmap
-                : ActivityManager.TaskDescription.loadTaskDescriptionIcon(iconFilename,
+        Bitmap tdIcon = null;
+        if (iconBitmap != null) {
+            tdIcon = iconBitmap;
+        } else {
+            try {
+                tdIcon = ActivityManager.TaskDescription.loadTaskDescriptionIcon(iconFilename,
                         taskKey.userId);
+            } catch (Exception e) {
+                // TODO: Investigate for b/26221779
+            }
+        }
         if (tdIcon != null) {
             return ssp.getBadgedIcon(new BitmapDrawable(res, tdIcon), taskKey.userId);
         }