summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-12-02 17:50:30 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-02 17:50:31 +0000
commit50f513c56989337aa0a48304213dd1deee2a0ede (patch)
tree0790c156be631185438a704b6115cf4b0e3718fe
parent1ee377764a59d0e2c245dd037006fa8c086f5683 (diff)
parent3d9c431ca4311eb8e87d303d2fcd3499c8856101 (diff)
downloadbase-50f513c56989337aa0a48304213dd1deee2a0ede.tar.gz
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
-rw-r--r--services/core/java/com/android/server/am/ActivityStack.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index e1b827843d6d..df4bf282e6de 100644
--- 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();