commit d4d170de39fffe70aaa39c70d6936465e0adb6ee
author Craig Mautner <cmautner@google.com> Fri Oct 25 20:09:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 25 20:09:20 2013 +0000
tree 18265c65eb2685643693400b83a7838a296e0d7f
parent 5357f8fd24bc578a1a584cac9c1943227816ea05
parent 6f6d56fd4d626b38fd10d6ed69e308f07531ba14

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

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();