aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Ensuring that each CacheEntry has a default title and content description." into ub-launcher3-burnaby

Browse Source
This commit is contained in:
Winson Chung
2015-05-28 22:48:50 +00:00
committed by Android (Google) Code Review
parent 04a9bc4a50 cdefc631f8
commit 0b06875971
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/launcher3/IconCache.java
View File

@@ -73,8 +73,8 @@ public class IconCache {
@Thunk static class CacheEntry {
public Bitmap icon;
public CharSequence title;
public CharSequence contentDescription;
public CharSequence title = "";
public CharSequence contentDescription = "";
public boolean isLowResIcon;
}
@@ -575,7 +575,7 @@ public class IconCache {
CacheEntry entry = mCache.get(cacheKey);
if (entry == null || (entry.isLowResIcon && !useLowResIcon)) {
entry = new CacheEntry();
mCache.put(cacheKey, entry);
boolean entryUpdated = true;
// Check the DB first.
if (!getEntryFromDB(cn, user, entry, useLowResIcon)) {
@@ -600,8 +600,14 @@ public class IconCache {
} catch (NameNotFoundException e) {
if (DEBUG) Log.d(TAG, "Application not installed " + packageName);
entryUpdated = false;
}
}
// Only add a filled-out entry to the cache
if (entryUpdated) {
mCache.put(cacheKey, entry);
}
}
return entry;
}