Merge "Catch an exception when loading a bubble icon" into main (ab8ce861) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleViewInfoTask.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -257,8 +257,16 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask
		return false;
		}

		Drawable bubbleDrawable = null;
		try {
		// Badged bubble image
		Drawable bubbleDrawable = iconFactory.getBubbleDrawable(c, info.shortcutInfo, b.getIcon());
		bubbleDrawable = iconFactory.getBubbleDrawable(c, info.shortcutInfo,
		b.getIcon());
		} catch (Exception e) {
		// If we can't create the icon we'll default to the app icon
		Log.w(TAG, "Exception creating icon for the bubble: " + b.getKey());
		}

		if (bubbleDrawable == null) {
		// Default to app icon
		bubbleDrawable = appIcon;
		@@ -268,7 +276,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask
		b.isImportantConversation());
		info.badgeBitmap = badgeBitmapInfo.icon;
		// Raw badge bitmap never includes the important conversation ring
		info.rawBadgeBitmap = b.isImportantConversation() // is this needed for bar?
		info.rawBadgeBitmap = b.isImportantConversation()
		? iconFactory.getBadgeBitmap(badgedIcon, false).icon
		: badgeBitmapInfo.icon;