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

* commit '50f513c56989337aa0a48304213dd1deee2a0ede':
  [ActivityManager] Invalidate last screenshot when activity relaunched
This commit is contained in:
Craig Mautner
2014-12-02 17:56:09 +00:00
committed by Android Git Automerger

View File

@@ -1819,6 +1819,9 @@ final class ActivityStack {
// Do over! // Do over!
mStackSupervisor.scheduleResumeTopActivities(); mStackSupervisor.scheduleResumeTopActivities();
} }
if (next == mLastScreenshotActivity) {
invalidateLastScreenshot();
}
if (mStackSupervisor.reportResumedActivityLocked(next)) { if (mStackSupervisor.reportResumedActivityLocked(next)) {
mNoAnimActivities.clear(); mNoAnimActivities.clear();
if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked(); if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();