commit 9052862ebb64a0fdccc897d634eab20a1ad6debe
author Craig Mautner <cmautner@google.com> Thu Dec 04 21:53:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 21:53:42 2014 +0000
tree 3c4aa30c54da426ef6fa3f449e97e04e7d2ee874
parent 799cb730298591a9d7303ea051451a3b6dc8e51f
parent 1864a509b06ab2e3e7de25d38776f03aca5e865e

Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index ad86aea..d98f03c 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1824,6 +1824,9 @@
                     // Do over!
                     mStackSupervisor.scheduleResumeTopActivities();
                 }
+                if (next == mLastScreenshotActivity) {
+                    invalidateLastScreenshot();
+                }
                 if (mStackSupervisor.reportResumedActivityLocked(next)) {
                     mNoAnimActivities.clear();
                     if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();