drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2013-10-25 20:09:20 +00:00
committed by Android (Google) Code Review
parent 5357f8fd24 6f6d56fd4d
commit d4d170de39
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/am/ActivityStack.java
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();