summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2015-10-12 11:22:50 -0700
committer Wale Ogunwale <ogunwale@google.com> 2015-10-13 08:17:52 -0700
commit979f5ed923db91b08279bb25799c3d54d743d1a7 (patch)
tree55a86a8b2a95d6be45a88e41e6d78f00edac4a4f
parentb52b18050a46e44a8ebe66bba426c79125f4b476 (diff)
Revert "Dont update thumbnails of freeform windows on focus change"
This reverts commit 17690ffcf7ed47b2719c65bb148190ddcdf4232c. Can not reproduce the problem reported in the original bug that required the reverted CL. Bug: 23591449 Bug: 23562904 Change-Id: I8262cef52036816e9b3f422f6b75b1959a4da7cd
-rw-r--r--services/core/java/com/android/server/am/ActivityStack.java10
-rw-r--r--services/core/java/com/android/server/am/TaskRecord.java8
2 files changed, 2 insertions, 16 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index cdb00ef17823..b4a8381a8201 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -901,14 +901,8 @@ final class ActivityStack {
prev.task.touchActiveTime();
clearLaunchTime(prev);
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
- // In freeform mode we only update the thumbnail when there is no thumbnail yet since every
- // focus change will request a thumbnail to be taken.
- // Note furthermore that since windows can change their content in freeform mode all the
- // time a thumbnail is possibly constantly outdated.
- if (mService.mHasRecents &&
- (next == null || next.noDisplay || next.task != prev.task || uiSleeping) &&
- (!prev.task.hasThumbnail() ||
- prev.task.stack.mStackId != FREEFORM_WORKSPACE_STACK_ID)) {
+ if (mService.mHasRecents
+ && (next == null || next.noDisplay || next.task != prev.task || uiSleeping)) {
prev.updateThumbnailLocked(screenshotActivities(prev), null);
}
stopFullyDrawnTraceIfNeeded();
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 77dbad4340ed..7dcda45a504b 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -478,14 +478,6 @@ final class TaskRecord {
}
/**
- * Returns true when we have a thumbnail.
- * @return Returns true if there is a thumbnail.
- */
- boolean hasThumbnail() {
- return mLastThumbnail != null;
- }
-
- /**
* Sets the last thumbnail.
* @return whether the thumbnail was set
*/