commit b223cc857bd71a8543ffe07c28957fe3acf33334
author Sunny Goyal <sunnygoyal@google.com> Fri Jun 14 07:52:44 2019 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Jun 14 07:56:32 2019 -0700
tree 7add3dd7626cd3b24ae2745c889a54954ce36652
parent 3d6e96d5265cdea78ad4e01b0f9fde0eea539094

Adding null check before accessing shortcut extras

Bug: 135257548
Change-Id: I1ecc296967a39eb73a60e71a4b1962b92298f327

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

diff --git a/src/com/android/launcher3/icons/LauncherIcons.java b/src/com/android/launcher3/icons/LauncherIcons.java
index 3b74307..7632408 100644
--- a/src/com/android/launcher3/icons/LauncherIcons.java
+++ b/src/com/android/launcher3/icons/LauncherIcons.java
@@ -189,6 +189,7 @@
     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);
         }