Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2014-12-04 21:53:38 +00:00
committed by Android (Google) Code Review
parent 799cb73029 1864a509b0
commit 9052862ebb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1824,6 +1824,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();