Merge "Adding null check before accessing shortcut extras" into ub-launcher3-qt-dev (b030e516) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/icons/LauncherIcons.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ public class LauncherIcons extends BaseIconFactory implements AutoCloseable {
		private String getBadgePackage(ShortcutInfo si) {
		String whitelistedPkg = mContext.getString(R.string.shortcutinfo_badgepkg_whitelist);
		if (whitelistedPkg.equals(si.getPackage())
		&& si.getExtras() != null
		&& si.getExtras().containsKey(EXTRA_BADGEPKG)) {
		return si.getExtras().getString(EXTRA_BADGEPKG);
		}