summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-06-14 07:52:44 -0700
committerSunny Goyal <sunnygoyal@google.com>2019-06-14 07:56:32 -0700
commitb223cc857bd71a8543ffe07c28957fe3acf33334 (patch)
tree7add3dd7626cd3b24ae2745c889a54954ce36652 /src
parent3d6e96d5265cdea78ad4e01b0f9fde0eea539094 (diff)
downloadandroid_packages_apps_Trebuchet-b223cc857bd71a8543ffe07c28957fe3acf33334.tar.gz
android_packages_apps_Trebuchet-b223cc857bd71a8543ffe07c28957fe3acf33334.tar.bz2
android_packages_apps_Trebuchet-b223cc857bd71a8543ffe07c28957fe3acf33334.zip
Adding null check before accessing shortcut extras
Bug: 135257548 Change-Id: I1ecc296967a39eb73a60e71a4b1962b92298f327
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/icons/LauncherIcons.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/icons/LauncherIcons.java b/src/com/android/launcher3/icons/LauncherIcons.java
index 3b74307db..763240885 100644
--- a/src/com/android/launcher3/icons/LauncherIcons.java
+++ b/src/com/android/launcher3/icons/LauncherIcons.java
@@ -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);
}