commit 6f6d56fd4d626b38fd10d6ed69e308f07531ba14
author Craig Mautner <cmautner@google.com> Thu Oct 24 16:02:07 2013 -0700
committer Craig Mautner <cmautner@google.com> Thu Oct 24 16:02:07 2013 -0700
tree db79f6a02914151a61a4a222b7065d9b7838fcf9
parent 9279d45b8d26c88c69fa917816ea396142627020

Do not take screenshots when launching activities...

Unless they are in another task.

Fixes bug 11374158.

Change-Id: I961d4ce9520bc84a182806db2ccb072501c8357a

services/java/com/android/server/am/ActivityStack.java

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 497d48c5..2e5dedf 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -740,7 +740,10 @@
         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();