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

2014-12-04 21:53:38 +00:00
parent 799cb73029 1864a509b0
commit 9052862ebb
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();