Merge "Adding catch for b/26221779" (636e71c3) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}