Trebuchet: fix potential NPE when info is null

Previously we were guarding against a null info object, but with the
the STK rename patches we will throw an NPE if info is null

issue-id: JALEBI-636
Issue: FEIJAO-815
Change-Id: I74e95f81b64361c1bb56307c0cc621f24e701648

1 files changed, 11 insertions, 8 deletions

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index cecfb6dd3..59239be90 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -568,15 +568,18 @@ public class IconCache {
             UserHandleCompat user, boolean usePackageIcon, boolean useLowResIcon) {
         ComponentKey cacheKey = new ComponentKey(componentName, user);
         CacheEntry entry = mCache.get(cacheKey);
-        boolean condition = (mContext.getResources().
-                getBoolean(R.bool.config_launcher_stkAppRename))
-                && info.getComponentName().getPackageName().toString()
-                        .equalsIgnoreCase(STK_PACKAGE_NAME);
+
         boolean isCustomTitle = false;
-        if (condition
-                && !TextUtils.isEmpty(((LauncherApplication) mContext)
-                        .getStkAppName())) {
-            isCustomTitle = true;
+        if (info != null) {
+            boolean condition = (mContext.getResources().
+                    getBoolean(R.bool.config_launcher_stkAppRename))
+                    && info.getComponentName().getPackageName().toString()
+                            .equalsIgnoreCase(STK_PACKAGE_NAME);
+            if (condition
+                    && !TextUtils.isEmpty(((LauncherApplication) mContext)
+                            .getStkAppName())) {
+                isCustomTitle = true;
+            }
         }
         if (entry == null || (entry.isLowResIcon && !useLowResIcon)) {
             entry = new CacheEntry();