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

* commit '50f513c56989337aa0a48304213dd1deee2a0ede': [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 17:56:09 +00:00
parent 9dec9e9d65 50f513c569
commit ca017a38c9
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
@@ -1819,6 +1819,9 @@ final class ActivityStack {
                    // Do over!
                    mStackSupervisor.scheduleResumeTopActivities();
                }
+                if (next == mLastScreenshotActivity) {
+                    invalidateLastScreenshot();
+                }
                if (mStackSupervisor.reportResumedActivityLocked(next)) {
                    mNoAnimActivities.clear();
                    if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();