commit 636e71c326f4938b1edd26953151987f6f2e5ec2
author Winson Chung <winsonc@google.com> Wed Dec 16 18:33:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 16 18:33:47 2015 +0000
tree faeac9537f85b9654d6b47d6b3a64c6197cf041b
parent 24fa70c2acf12030682ced600d8d8250e7606e85
parent f4fdabf69811d844157daabdd500cf3db9d4ac19

Merge "Adding catch for b/26221779"

packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java

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 965e7a67..c72d166 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 @@
 
     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);
         }