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
Change-Id: I74e95f81b64361c1bb56307c0cc621f24e701648
(cherry picked from commit f3c0e343f0f7c5ce32390e8402519456b32978b2)

1 files changed, 13 insertions, 9 deletions

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index de53b9718..365f8ed2a 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -332,17 +332,21 @@ public class IconCache {
             boolean usePackageIcon, int unreadNum) {
         CacheKey cacheKey = new CacheKey(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);
-        String activity = info.getComponentName().getClassName().toString();
 
         boolean isCustomTitle = false;
-        if (condition
-                && !TextUtils.isEmpty(((LauncherApplication) mContext)
-                        .getStkAppName(activity))) {
-            isCustomTitle = true;
+        String activity = null;
+        if (info != null) {
+            boolean condition = (mContext.getResources().
+                    getBoolean(R.bool.config_launcher_stkAppRename))
+                    && info.getComponentName().getPackageName().toString()
+                            .equalsIgnoreCase(STK_PACKAGE_NAME);
+            activity = info.getComponentName().getClassName().toString();
+
+            if (condition
+                    && !TextUtils.isEmpty(((LauncherApplication) mContext)
+                            .getStkAppName(activity))) {
+                isCustomTitle = true;
+            }
         }
         if (entry == null || unreadNum >= 0) {
             entry = new CacheEntry();