From 9d4bdad6b7d23ffefee6d1c57af13f95b993a8b1 Mon Sep 17 00:00:00 2001 From: emancebo Date: Sun, 6 Sep 2015 14:23:34 -0700 Subject: 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 --- src/com/android/launcher3/IconCache.java | 19 +++++++++++-------- 1 file 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(); -- cgit v1.2.3