commit 614436777cd9be6c9625e6c0d7f928a8d63588c4
author Sunny Goyal <sunnygoyal@google.com> Fri Jun 14 11:19:58 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 14 11:19:58 2019 -0700
tree d1c3e9230f833def622602234781dd9629b5946a
parent 5fd6f88b1b448062b337c3983f5a8ebbeee90b16
parent 8148630c0705513a162b9c4d8c4d9430a2844c9c

Merge "Adding null check before accessing shortcut extras" into ub-launcher3-qt-dev am: b030e5162c
am: 8148630c07

Change-Id: I64a786967d2c324acb19d4afee3ae089ce93f6e0

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