From 5f2766f30c57dcd5bcffe3ca6838f1f10e013ef6 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 16 Sep 2021 11:31:38 -0700
Subject: [PATCH] Skip adding tasks to the skip list if they won't be processed

Bug: 199523354
Test: atest TaskSnapshotControllerTest
Change-Id: Ibb94dac74da8adbc0fedd3ca8be26b6b027417d1
---
 .../java/com/android/server/wm/TaskSnapshotController.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index 63951d970808a..5ce9938ff71dd 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -168,6 +168,9 @@ class TaskSnapshotController {
      */
     @VisibleForTesting
     void addSkipClosingAppSnapshotTasks(ArraySet<Task> tasks) {
+        if (shouldDisableSnapshots()) {
+            return;
+        }
         mSkipClosingAppSnapshotTasks.addAll(tasks);
     }