Merge "Adding null check before accessing shortcut extras" into ub-launcher3-qt-dev

am: b030e5162c

Change-Id: I21463733b254fe2e05d5324288900c341e51b93a
This commit is contained in:
Sunny Goyal
2019-06-14 11:10:57 -07:00
committed by android-build-merger

View File

@@ -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);
}