Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f95a9fe5: Merge "Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)" into lmp-mr1-dev

Browse Source 
* commit 'f95a9fe5372c5f8f80b578ad98d66e92a7cc8608':
  Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)
This commit is contained in:
Winson Chung
2014-11-18 20:03:26 +00:00
committed by Android Git Automerger
parent 0af82f65d3 f95a9fe537
commit 3565b6f051
1 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
View File

@@ -170,65 +170,65 @@ class TaskResourceLoader implements Runnable {
} else { } else {
RecentsConfiguration config = RecentsConfiguration.getInstance(); RecentsConfiguration config = RecentsConfiguration.getInstance();
SystemServicesProxy ssp = mSystemServicesProxy; SystemServicesProxy ssp = mSystemServicesProxy;
// If we've stopped the loader, then fall thorugh to the above logic to wait on // If we've stopped the loader, then fall through to the above logic to wait on
// the load thread // the load thread
if (ssp == null) continue; if (ssp != null) {
// Load the next item from the queue
// Load the next item from the queue final Task t = mLoadQueue.nextTask();
final Task t = mLoadQueue.nextTask(); if (t != null) {
if (t != null) { Drawable cachedIcon = mApplicationIconCache.get(t.key);
Drawable cachedIcon = mApplicationIconCache.get(t.key); Bitmap cachedThumbnail = mThumbnailCache.get(t.key);
Bitmap cachedThumbnail = mThumbnailCache.get(t.key);
// Load the application icon if it is stale or we haven't cached one yet
if (cachedIcon == null) {
cachedIcon = getTaskDescriptionIcon(t.key, t.icon, t.iconFilename, ssp,
mContext.getResources());
// Load the application icon if it is stale or we haven't cached one yet
if (cachedIcon == null) { if (cachedIcon == null) {
ActivityInfo info = ssp.getActivityInfo(t.key.baseIntent.getComponent(), cachedIcon = getTaskDescriptionIcon(t.key, t.icon, t.iconFilename, ssp,
t.key.userId); mContext.getResources());
if (info != null) {
if (DEBUG) Log.d(TAG, "Loading icon: " + t.key); if (cachedIcon == null) {
cachedIcon = ssp.getActivityIcon(info, t.key.userId); ActivityInfo info = ssp.getActivityInfo(
t.key.baseIntent.getComponent(), t.key.userId);
if (info != null) {
if (DEBUG) Log.d(TAG, "Loading icon: " + t.key);
cachedIcon = ssp.getActivityIcon(info, t.key.userId);
}
} }
}
if (cachedIcon == null) { if (cachedIcon == null) {
cachedIcon = mDefaultApplicationIcon; cachedIcon = mDefaultApplicationIcon;
} }
// At this point, even if we can't load the icon, we will set the default // At this point, even if we can't load the icon, we will set the
// icon. // default icon.
mApplicationIconCache.put(t.key, cachedIcon); mApplicationIconCache.put(t.key, cachedIcon);
}
// Load the thumbnail if it is stale or we haven't cached one yet
if (cachedThumbnail == null) {
if (config.svelteLevel < RecentsConfiguration.SVELTE_DISABLE_LOADING) {
if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key);
cachedThumbnail = ssp.getTaskThumbnail(t.key.id);
} }
// Load the thumbnail if it is stale or we haven't cached one yet
if (cachedThumbnail == null) { if (cachedThumbnail == null) {
cachedThumbnail = mDefaultThumbnail; if (config.svelteLevel < RecentsConfiguration.SVELTE_DISABLE_LOADING) {
} if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key);
// When svelte, we trim the memory to just the visible thumbnails when cachedThumbnail = ssp.getTaskThumbnail(t.key.id);
// leaving, so don't thrash the cache as the user scrolls (just load them
// from scratch each time)
if (config.svelteLevel < RecentsConfiguration.SVELTE_LIMIT_CACHE) {
mThumbnailCache.put(t.key, cachedThumbnail);
}
}
if (!mCancelled) {
// Notify that the task data has changed
final Drawable newIcon = cachedIcon;
final Bitmap newThumbnail = cachedThumbnail == mDefaultThumbnail
? null : cachedThumbnail;
mMainThreadHandler.post(new Runnable() {
@Override
public void run() {
t.notifyTaskDataLoaded(newThumbnail, newIcon);
} }
}); if (cachedThumbnail == null) {
cachedThumbnail = mDefaultThumbnail;
}
// When svelte, we trim the memory to just the visible thumbnails when
// leaving, so don't thrash the cache as the user scrolls (just load
// them from scratch each time)
if (config.svelteLevel < RecentsConfiguration.SVELTE_LIMIT_CACHE) {
mThumbnailCache.put(t.key, cachedThumbnail);
}
}
if (!mCancelled) {
// Notify that the task data has changed
final Drawable newIcon = cachedIcon;
final Bitmap newThumbnail = cachedThumbnail == mDefaultThumbnail
? null : cachedThumbnail;
mMainThreadHandler.post(new Runnable() {
@Override
public void run() {
t.notifyTaskDataLoaded(newThumbnail, newIcon);
}
});
}
} }
} }