commit 84b4318cbda6a6c68a2b906ef809138d094a42ae
author Zak Cohen <zakcohen@google.com> Mon Mar 09 14:36:01 2020 -0700
committer Zak Cohen <zakcohen@google.com> Tue Mar 24 18:31:50 2020 +0000
tree a2acff5129b14a99dfcd6fb3463bdae5681416be
parent 0fb3776287d6467b080171f1c4d2ed637525ad69

ContentSuggestions - restore snapshots when needed

Make ContentSuggestions restore snapshots from disk where needed.
Previously this wasn't needed as only the running task would be
used for content suggestions. Now it can be invoked for any task
in Overview so need to be able to restore snapshots from disk.

Bug: 149595462
Test: manual
Change-Id: Ia67efc122a44b27a9049e48afaf2ddb789bc31b9

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 890b945..659bb99 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -7476,10 +7476,10 @@
         }
 
         @Override
-        public ActivityManager.TaskSnapshot getTaskSnapshotNoRestore(int taskId,
-                boolean isLowResolution) {
+        public ActivityManager.TaskSnapshot getTaskSnapshotBlocking(
+                int taskId, boolean isLowResolution) {
             return ActivityTaskManagerService.this.getTaskSnapshot(taskId, isLowResolution,
-                    false /* restoreFromDisk */);
+                    true /* restoreFromDisk */);
         }
 
         @Override