summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremancebo <emancebo@cyngn.com>2015-09-06 14:23:34 -0700
committerMichael Bestas <mikeioannina@gmail.com>2016-09-16 19:08:02 +0300
commit9d4bdad6b7d23ffefee6d1c57af13f95b993a8b1 (patch)
treef2db8249c43f95d6f66006cec0e66d30e811d265
parent66c03a84a78dac8db026d1eee73c5210c3310620 (diff)
downloadandroid_packages_apps_Trebuchet-9d4bdad6b7d23ffefee6d1c57af13f95b993a8b1.zip
android_packages_apps_Trebuchet-9d4bdad6b7d23ffefee6d1c57af13f95b993a8b1.tar.gz
android_packages_apps_Trebuchet-9d4bdad6b7d23ffefee6d1c57af13f95b993a8b1.tar.bz2
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
-rw-r--r--src/com/android/launcher3/IconCache.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index cecfb6d..59239be 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();