commit b030e5162c1664614730ff04908adc3193ad1ec6
author Sunny Goyal <sunnygoyal@google.com> Fri Jun 14 17:50:10 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 17:50:10 2019 +0000
tree b4c34c9826e8925b1268e58a06ef93333bcbf45d
parent dfbb964dcc44dec89f6c64801f60fdcb93c9e5de
parent b223cc857bd71a8543ffe07c28957fe3acf33334

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

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