am d4d170de: Merge "Do not take screenshots when launching activities..." into klp-dev

* commit 'd4d170de39fffe70aaa39c70d6936465e0adb6ee':
  Do not take screenshots when launching activities...
This commit is contained in:
Craig Mautner
2013-10-25 13:12:05 -07:00
committed by Android Git Automerger

View File

@@ -740,7 +740,10 @@ final class ActivityStack {
prev.state = ActivityState.PAUSING;
prev.task.touchActiveTime();
clearLaunchTime(prev);
prev.updateThumbnail(screenshotActivities(prev), null);
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
if (next == null || next.task != prev.task) {
prev.updateThumbnail(screenshotActivities(prev), null);
}
stopFullyDrawnTraceIfNeeded();
mService.updateCpuStats();