summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-09 13:51:13 -0700
committerWinson Chung <winsonc@google.com>2015-06-09 13:51:13 -0700
commita278cae54cf8768a5d7caf54f21ac9f254c11c95 (patch)
tree7e844cb2848b1dc6e8eda843deb46226cb544dc2 /packages
parent7e8e29ad2e5e8a722db163f5e740ba3453c45d9b (diff)
downloadframeworks_base-a278cae54cf8768a5d7caf54f21ac9f254c11c95.zip
frameworks_base-a278cae54cf8768a5d7caf54f21ac9f254c11c95.tar.gz
frameworks_base-a278cae54cf8768a5d7caf54f21ac9f254c11c95.tar.bz2
Skip recents preloading when there is no task to animate to.
Bug: 21696081
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/Recents.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
index 7d2b5c87..442af90 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
@@ -365,7 +365,7 @@ public class Recents extends SystemUI
void preloadRecentsInternal() {
// Preload only the raw task list into a new load plan (which will be consumed by the
- // RecentsActivity)
+ // RecentsActivity) only if there is a task to animate to.
ActivityManager.RunningTaskInfo topTask = mSystemServicesProxy.getTopMostTask();
MutableBoolean topTaskHome = new MutableBoolean(true);
RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
@@ -374,8 +374,10 @@ public class Recents extends SystemUI
sInstanceLoadPlan.preloadRawTasks(topTaskHome.value);
loader.preloadTasks(sInstanceLoadPlan, topTaskHome.value);
TaskStack top = sInstanceLoadPlan.getAllTaskStacks().get(0);
- preCacheThumbnailTransitionBitmapAsync(topTask, top, mDummyStackView,
- topTaskHome.value);
+ if (top.getTaskCount() > 0) {
+ preCacheThumbnailTransitionBitmapAsync(topTask, top, mDummyStackView,
+ topTaskHome.value);
+ }
}
}