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

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

Browse Source 
* commit '6f2fb33f907b3af246f79a72e79ea7e4192c7478':
  Do not take screenshots when launching activities...
This commit is contained in:
Craig Mautner
2013-10-25 13:15:13 -07:00
committed by Android Git Automerger
parent 854b63f674 6f2fb33f90
commit 1f57b6055e
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();