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

* commit 'b361f48b38f89c029a4ea5548d876f34fd74a7fc': [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 18:11:59 +00:00
parent c03fcb74f8 b361f48b38
commit 2d223d4e93
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();