am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"

* commit 'ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de': [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 18:04:10 +00:00
parent 3a8d6c8086 ca017a38c9
commit b361f48b38
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1822,6 +1822,9 @@ final class ActivityStack {
                    // Do over!
                    mStackSupervisor.scheduleResumeTopActivities();
                }
+                if (next == mLastScreenshotActivity) {
+                    invalidateLastScreenshot();
+                }
                if (mStackSupervisor.reportResumedActivityLocked(next)) {
                    mNoAnimActivities.clear();
                    if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();