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

* commit '9052862ebb64a0fdccc897d634eab20a1ad6debe': [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-04 21:58:24 +00:00
parent f6d03f3980 9052862ebb
commit b97b19f6a4
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
@@ -1824,6 +1824,9 @@ final class ActivityStack {
                    // Do over!
                    mStackSupervisor.scheduleResumeTopActivities();
                }
+                if (next == mLastScreenshotActivity) {
+                    invalidateLastScreenshot();
+                }
                if (mStackSupervisor.reportResumedActivityLocked(next)) {
                    mNoAnimActivities.clear();
                    if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();