From b223cc857bd71a8543ffe07c28957fe3acf33334 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 14 Jun 2019 07:52:44 -0700
Subject: [PATCH] Adding null check before accessing shortcut extras

Bug: 135257548
Change-Id: I1ecc296967a39eb73a60e71a4b1962b92298f327
---
 src/com/android/launcher3/icons/LauncherIcons.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/icons/LauncherIcons.java b/src/com/android/launcher3/icons/LauncherIcons.java
index 3b74307dbb..763240885e 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);
         }